@nu-art/google-services-backend 0.401.9 → 0.500.6

package/modules/ModuleBE_Auth.d.ts

@@ -6,9 +6,19 @@ import { google } from 'googleapis';
 import { GoogleAuth, JWTInput } from 'google-auth-library';
 type AuthClient_ = typeof google.auth.getClient;
 type ClientOptions = NonNullable<Parameters<AuthClient_>[0]>['clientOptions'];
+export type AuthEntryConfig = {
+    credentials: JWT_Input | string;
+    mongo?: {
+        mongoUrl?: string;
+        firestoreMongo?: {
+            firestoreUid: string;
+            firestoreLocation: string;
+        };
+    };
+};
 type AuthModuleConfig = {
     auth: {
-        [k: string]: JWT_Input | string;
+        [k: string]: JWT_Input | string | AuthEntryConfig;
     };
 };
 export type JWT_Input = JWTInput;
@@ -17,7 +27,8 @@ export declare class ModuleBE_Auth_Class extends Module<AuthModuleConfig> {
     getAuth(authKey: string, scopes: string[], clientOptions?: ClientOptions): ({
         auth: GoogleAuth;
     });
-    getAuthConfig(authKey: string): string | JWTInput;
+    getAuthConfig(authKey: string): JWT_Input | string | AuthEntryConfig;
+    getCredentials(authKey: string): JWT_Input | string;
     getJWT(authKey: string, scopes: string[]): Promise<import("google-auth-library").Credentials>;
 }
 export declare const ModuleBE_Auth: ModuleBE_Auth_Class;

package/modules/ModuleBE_Auth.js

@@ -9,10 +9,10 @@ export class ModuleBE_Auth_Class extends Module {
         this.setDefaultConfig({ auth: {} });
     }
     getAuth(authKey, scopes, clientOptions) {
-        const conf = this.getAuthConfig(authKey);
+        const conf = this.getCredentials(authKey);
         const base = typeof conf === 'string'
             ? { keyFile: conf }
-            : { credentials: conf }; // JWTInput
+            : { credentials: conf };
         const auth = new GoogleAuth({ ...base, scopes, clientOptions });
         return { auth };
     }
@@ -22,11 +22,18 @@ export class ModuleBE_Auth_Class extends Module {
             throw new ImplementationMissingException(`Config of authKey: ${authKey} was not found`);
         return projectAuth;
     }
+    getCredentials(authKey) {
+        const config = this.getAuthConfig(authKey);
+        if (typeof config === 'string')
+            return config;
+        if ('credentials' in config)
+            return config.credentials;
+        return config;
+    }
     async getJWT(authKey, scopes) {
-        const authConfig = this.getAuthConfig(authKey);
-        if (typeof authConfig === 'string') {
-            return new JWT({ keyFile: authConfig, scopes }).authorize();
-        }
+        const credentials = this.getCredentials(authKey);
+        if (typeof credentials === 'string')
+            return new JWT({ keyFile: credentials, scopes }).authorize();
         throw new NotImplementedYetException('cannot create a JWT from a raw credentials.. need path to file');
     }
 }

package/modules/ModuleBE_GooglePubSub.d.ts

@@ -1,4 +1,4 @@
-import { Module } from "@nu-art/ts-common";
+import { Module } from '@nu-art/ts-common';
 import { PublishOptions } from '@google-cloud/pubsub';
 declare class ModuleBE_GooglePubSub_Class extends Module {
     project(projectId: string, authKey?: string): {

package/modules/ModuleBE_GooglePubSub.js

@@ -1,6 +1,6 @@
-import { Module } from "@nu-art/ts-common";
+import { Module } from '@nu-art/ts-common';
 import { PubSub } from '@google-cloud/pubsub';
-import { ModuleBE_Auth } from "./ModuleBE_Auth.js";
+import { ModuleBE_Auth } from './ModuleBE_Auth.js';
 class ModuleBE_GooglePubSub_Class extends Module {
     project(projectId, authKey = projectId) {
         const authObject = ModuleBE_Auth.getAuth(authKey, []);

package/modules/ModuleBE_SecretManager.d.ts

@@ -13,6 +13,7 @@ export declare class SecretKey<T extends AnyPrimitive> {
     get(fallbackValue: T): Promise<T>;
     set(secret: T): Promise<string>;
     previous(reverseIndex?: number): Promise<T | undefined>;
+    delete(): Promise<void>;
     modifiedTimestamp(): Promise<number>;
 }
 export declare class ModuleBE_SecretManager_Class extends Module {
@@ -24,6 +25,7 @@ export declare class ModuleBE_SecretManager_Class extends Module {
     updateSecretImpl: (secret: ISecret, data: string) => Promise<void>;
     listEnabledVersions: (secret: Secret) => Promise<google.cloud.secretmanager.v1.ISecretVersion[]>;
     getSecretVersionMetadata: (versionName: string) => Promise<google.cloud.secretmanager.v1.ISecretVersion>;
+    deleteSecret: (_secret: Secret) => Promise<void>;
     getOrCreateSecret: (_secret: Secret) => Promise<ISecret>;
 }
 export declare const ModuleBE_SecretManager: ModuleBE_SecretManager_Class;

package/modules/ModuleBE_SecretManager.js

@@ -32,6 +32,9 @@ export class SecretKey {
         const rawSecret = await ModuleBE_SecretManager.getSecretValueImpl(version.name);
         return rawSecret ? JSON.parse(rawSecret) : undefined;
     }
+    async delete() {
+        await ModuleBE_SecretManager.deleteSecret(this.secret);
+    }
     async modifiedTimestamp() {
         const versions = await ModuleBE_SecretManager.listEnabledVersions(this.secret);
         if (!versions.length)
@@ -92,6 +95,17 @@ export class ModuleBE_SecretManager_Class extends Module {
         const [version] = await this.client.getSecretVersion({ name: versionName });
         return version;
     };
+    deleteSecret = async (_secret) => {
+        const name = composeSecretKey(_secret);
+        try {
+            await this.client.deleteSecret({ name });
+        }
+        catch (err) {
+            if (err.code === 5)
+                return;
+            throw new ThisShouldNotHappenException(`Failed to delete secret (${JSON.stringify(_secret)})`, err);
+        }
+    };
     getOrCreateSecret = async (_secret) => {
         const name = composeSecretKey(_secret);
         try {

package/modules/ModuleBE_WhoAmI_GCP.d.ts

@@ -1,5 +1,10 @@
 import { Module } from '@nu-art/ts-common';
-export declare class ModuleBE_WhoAmI_GCP_Class extends Module {
+type Config = {
+    printEnvVars: boolean;
+    printIdentity: boolean;
+};
+export declare class ModuleBE_WhoAmI_GCP_Class extends Module<Config> {
+    constructor();
     init(): void;
     printCallerIdentity: () => Promise<{
         projectId: string;
@@ -7,3 +12,4 @@ export declare class ModuleBE_WhoAmI_GCP_Class extends Module {
     }>;
 }
 export declare const ModuleBE_WhoAmI_GCP: ModuleBE_WhoAmI_GCP_Class;
+export {};

package/modules/ModuleBE_WhoAmI_GCP.js

@@ -1,12 +1,25 @@
-import { Module } from '@nu-art/ts-common';
+import { Module, tsValidateMandatoryBoolean } from '@nu-art/ts-common';
 import { GoogleAuth } from 'google-auth-library';
+const defaultConfig = { printEnvVars: false, printIdentity: true };
+const configValidator = {
+    printEnvVars: tsValidateMandatoryBoolean,
+    printIdentity: tsValidateMandatoryBoolean
+};
 export class ModuleBE_WhoAmI_GCP_Class extends Module {
+    constructor() {
+        super();
+        this.setDefaultConfig(defaultConfig);
+        this.setConfigValidator(configValidator);
+    }
     init() {
         this.printCallerIdentity().then(({ projectId, info }) => {
-            this.logInfo('env: ', process.env);
-            this.logInfo('GOOGLE_APPLICATION_CREDENTIALS: ', process.env.GOOGLE_APPLICATION_CREDENTIALS ?? 'not set');
-            this.logInfo(`🔐 GCP Caller Identity: ${info.email || info.sub}`);
-            this.logInfo(`🏗️ GCP Project ID: ${projectId}`);
+            if (this.config.printEnvVars)
+                this.logInfo('env: ', process.env);
+            if (this.config.printIdentity) {
+                this.logInfo('GOOGLE_APPLICATION_CREDENTIALS: ', process.env.GOOGLE_APPLICATION_CREDENTIALS ?? 'not set');
+                this.logInfo(`🔐 GCP Caller Identity: ${info.email || info.sub}`);
+                this.logInfo(`🏗️ GCP Project ID: ${projectId}`);
+            }
         }).catch(err => {
             this.logError('error: ', err);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/google-services-backend",
-  "version": "0.401.9",
+  "version": "0.500.6",
   "description": "google-services Backend",
   "keywords": [
     "TacB0sS",
@@ -33,7 +33,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@nu-art/ts-common": "0.401.9",
+    "@nu-art/ts-common": "0.500.6",
     "@google-cloud/pubsub": "^4.0.0",
     "@google-cloud/secret-manager": "^6.1.0",
     "google-auth-library": "^10.0.0",