@mondomob/gae-node-nestjs 9.0.0 → 9.0.1

package/.history/src/gcloud/storage.provider_20200522143909.ts

@@ -0,0 +1,41 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { Configuration } from '../configuration';
+import { Bucket, StorageOptions, Storage } from '@google-cloud/storage';
+import { createLogger, Logger } from './logging';
+
+@Injectable()
+export class StorageProvider {
+  private readonly _storage: Storage;
+  private readonly _defaultBucket: Bucket;
+  private readonly logger: Logger;
+
+  constructor(@Inject('Configuration') private readonly configurationProvider: Configuration) {
+    this.logger = createLogger('storage');
+    const config: StorageOptions = {};
+    if (configurationProvider.isDevelopment()) {
+      this.logger.info(
+        'Application is running locally, using keyfile.json credentials to connect to Google Cloud Storage',
+      );
+      config.keyFilename = './keyfile.json';
+    }
+    this._storage = new Storage(config);
+    this.logger.info(`Default Google Cloud Storage bucket: ${configurationProvider.bucket}`);
+    this._defaultBucket = this.storage.bucket(configurationProvider.bucket);
+  }
+
+  get storage(): Storage {
+    return this._storage;
+  }
+
+  get defaultBucket(): Bucket {
+    return this._defaultBucket;
+  }
+
+  async getDefaultBucketResumableUploadUrl(fileId: string): Promise<string> {
+    const gcsFile = this._defaultBucket.file(fileId);
+    const urls = await gcsFile.createResumableUpload({
+      origin: this.configurationProvider.host,
+    });
+    return urls[0];
+  }
+}

package/.history/src/gcloud/storage.provider_20200616175358.ts

@@ -0,0 +1,41 @@
+import { Inject, Injectable } from '@nestjs/common';
+// import { Configuration } from '../configuration';
+import { Bucket, StorageOptions, Storage } from '@google-cloud/storage';
+import { createLogger, Logger } from './logging';
+
+@Injectable()
+export class StorageProvider {
+  private readonly _storage: Storage;
+  private readonly _defaultBucket: Bucket;
+  private readonly logger: Logger;
+
+  constructor(@Inject('Configuration') private readonly configurationProvider: Configuration) {
+    this.logger = createLogger('storage');
+    const config: StorageOptions = {};
+    if (configurationProvider.isDevelopment()) {
+      this.logger.info(
+        'Application is running locally, using keyfile.json credentials to connect to Google Cloud Storage',
+      );
+      config.keyFilename = './keyfile.json';
+    }
+    this._storage = new Storage(config);
+    this.logger.info(`Default Google Cloud Storage bucket: ${configurationProvider.bucket}`);
+    this._defaultBucket = this.storage.bucket(configurationProvider.bucket);
+  }
+
+  get storage(): Storage {
+    return this._storage;
+  }
+
+  get defaultBucket(): Bucket {
+    return this._defaultBucket;
+  }
+
+  async getDefaultBucketResumableUploadUrl(fileId: string): Promise<string> {
+    const gcsFile = this._defaultBucket.file(fileId);
+    const urls = await gcsFile.createResumableUpload({
+      origin: this.configurationProvider.host,
+    });
+    return urls[0];
+  }
+}

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 9.0.1 (2023-08-17)
+
+Minor change in the server-start script to remove use of 'localhost' when starting and listening for start of datastore emulator.
+
 ## 9.0.0 (2021-11-10)
 
 - Update to NestJS 8

package/README.md

@@ -1,5 +1,19 @@
 # gae-node-nestjs
+## New package
+Please note that while this package will have priority fixes for existing projects, our primary focus has moved to
+our [gae-js](https://github.com/mondo-mob/gae-js) libraries.
 
+While this library offers a lot of utilities and help for using `nestjs`, `graphql`, `datastore` the new libraries offer 
+more targeted libraries, with the following benefits:
+
+ - Not being tied to `nestjs` and easily used in `express`, `cloud functions`, or others of your choosing
+ - A library for using `firestore` natively
+ - A library for those still using `datastore` mode
+ - Other libraries for specifics. Please see the readme for details.
+
+A lot of the underlying utilities have been ported across to the new libraries.
+
+## About
 Node framework using [nestjs](https://nestjs.com/) and integrating with Google App Engine, particularly Google Data Store.
 
 

package/dist/auth/auth.graphql.d.ts

@@ -0,0 +1,36 @@
+import { CredentialRepository } from './auth.repository';
+import { AuthService } from './auth.service';
+import { InviteUserService } from './invite-user.service';
+import { PasswordResetService } from './password-reset.service';
+import { Context, IUser } from '../datastore/context';
+export declare class AuthResolver {
+    private readonly credentialsRepository;
+    private readonly authService;
+    private readonly passwordResetService;
+    private readonly inviteUserService;
+    constructor(credentialsRepository: CredentialRepository, authService: AuthService, passwordResetService: PasswordResetService, inviteUserService: InviteUserService);
+    credentials({ id }: IUser, _args: {}, context: Context): Promise<{
+        username: string;
+        type: "google" | "saml" | "auth0" | "oidc" | "password";
+    } | undefined>;
+    me(_req: void, _args: void, context: Context<IUser>): Promise<IUser | undefined>;
+    resetPassword(_req: void, { email }: {
+        email: string;
+    }, context: Context): Promise<void>;
+    confirmResetPassword(_req: void, { code, newPassword }: {
+        code: string;
+        newPassword: string;
+    }, context: Context): Promise<void>;
+    inviteUser(_req: void, { email, roles }: {
+        email: string;
+        roles: string[];
+    }, context: Context): Promise<string>;
+    checkActivationCode(_req: void, { code }: {
+        code: string;
+    }, context: Context): Promise<string | null>;
+    activateAccount(_req: void, { code, name, password }: {
+        code: string;
+        name: string;
+        password: string;
+    }, context: Context): Promise<void>;
+}

package/dist/auth/auth.graphql.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthResolver = void 0;
+const tslib_1 = require("tslib");
+const graphql_1 = require("@nestjs/graphql");
+const auth_repository_1 = require("./auth.repository");
+const auth_service_1 = require("./auth.service");
+const auth_guard_1 = require("./auth.guard");
+const invite_user_service_1 = require("./invite-user.service");
+const password_reset_service_1 = require("./password-reset.service");
+let AuthResolver = class AuthResolver {
+    constructor(credentialsRepository, authService, passwordResetService, inviteUserService) {
+        this.credentialsRepository = credentialsRepository;
+        this.authService = authService;
+        this.passwordResetService = passwordResetService;
+        this.inviteUserService = inviteUserService;
+    }
+    async credentials({ id }, _args, context) {
+        const [maybeCredentials] = await this.credentialsRepository.query(context, {
+            filters: {
+                userId: id,
+            },
+            limit: 1,
+        });
+        if (maybeCredentials && maybeCredentials.length > 0) {
+            const credentials = maybeCredentials[0];
+            return {
+                username: credentials.id,
+                type: credentials.type,
+            };
+        }
+    }
+    async me(_req, _args, context) {
+        if (context.user) {
+            return context.user;
+        }
+    }
+    async resetPassword(_req, { email }, context) {
+        return await this.passwordResetService.resetPassword(context, email);
+    }
+    async confirmResetPassword(_req, { code, newPassword }, context) {
+        return await this.passwordResetService.confirmResetPassword(context, code, newPassword);
+    }
+    async inviteUser(_req, { email, roles }, context) {
+        const { user: { id }, } = await this.inviteUserService.inviteUser(context, { email, roles });
+        return id;
+    }
+    async checkActivationCode(_req, { code }, context) {
+        return this.inviteUserService.checkActivationCode(context, code);
+    }
+    async activateAccount(_req, { code, name, password }, context) {
+        await this.inviteUserService.activateAccount(context, code, name, password);
+    }
+};
+tslib_1.__decorate([
+    auth_guard_1.Roles('admin'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AuthResolver.prototype, "credentials", null);
+tslib_1.__decorate([
+    auth_guard_1.AllowAnonymous(),
+    graphql_1.Query('me'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [void 0, void 0, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AuthResolver.prototype, "me", null);
+tslib_1.__decorate([
+    auth_guard_1.AllowAnonymous(),
+    graphql_1.Mutation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [void 0, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AuthResolver.prototype, "resetPassword", null);
+tslib_1.__decorate([
+    auth_guard_1.AllowAnonymous(),
+    graphql_1.Mutation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [void 0, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AuthResolver.prototype, "confirmResetPassword", null);
+tslib_1.__decorate([
+    auth_guard_1.Roles('admin'),
+    graphql_1.Mutation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [void 0, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AuthResolver.prototype, "inviteUser", null);
+tslib_1.__decorate([
+    auth_guard_1.AllowAnonymous(),
+    graphql_1.Query('checkActivationCode'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [void 0, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AuthResolver.prototype, "checkActivationCode", null);
+tslib_1.__decorate([
+    auth_guard_1.AllowAnonymous(),
+    graphql_1.Mutation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [void 0, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AuthResolver.prototype, "activateAccount", null);
+AuthResolver = tslib_1.__decorate([
+    graphql_1.Resolver('User'),
+    tslib_1.__metadata("design:paramtypes", [auth_repository_1.CredentialRepository,
+        auth_service_1.AuthService,
+        password_reset_service_1.PasswordResetService,
+        invite_user_service_1.InviteUserService])
+], AuthResolver);
+exports.AuthResolver = AuthResolver;
+//# sourceMappingURL=auth.graphql.js.map

package/dist/auth/auth.graphql.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.graphql.js","sourceRoot":"","sources":["../../src/auth/auth.graphql.ts"],"names":[],"mappings":"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"}

package/dist/auth/auth.graphqls

@@ -0,0 +1,21 @@
+type Credentials {
+  username: String
+  type: String
+}
+
+extend type User {
+  credentials: Credentials
+}
+
+type Mutation {
+  signIn(email: String!, password: String!): User
+  resetPassword(email: String!): Boolean
+  confirmResetPassword(code: String!, newPassword: String!): Boolean
+  inviteUser(email: String!, roles: [String!]): String
+  activateAccount(code: String!, name: String!, password: String!): Boolean
+}
+
+type Query {
+  checkActivationCode(code: String!): String
+  me: User
+}

package/dist/module.js

@@ -85,10 +85,10 @@ GCloudModule = GCloudModule_1 = (0, tslib_1.__decorate)([
             {
                 provide: mail_sender_1.MAIL_SENDER,
                 useFactory: (config, gmailConfigurer) => {
-                    const disableMailLogger = !!config.devHooks && config.devHooks.disableLocalMailLogger;
+                    var _a;
                     console.log(`Configuring mail sender with devHooks: `, config.devHooks);
                     let mailSender;
-                    if (config.environment === 'development' && !disableMailLogger) {
+                    if (config.environment === 'development' && !((_a = config.devHooks) === null || _a === void 0 ? void 0 : _a.disableLocalMailLogger)) {
                         mailSender = new mail_logging_sender_1.MailLoggingSender();
                     }
                     else if (config.auth.smtp && config.auth.smtp.enabled) {
@@ -97,14 +97,16 @@ GCloudModule = GCloudModule_1 = (0, tslib_1.__decorate)([
                     else {
                         mailSender = new gmail_sender_1.GmailSender(gmailConfigurer, config);
                     }
-                    if (config.devHooks && config.devHooks.emailWhitelist) {
-                        mailSender = new mail_whitelist_sender_1.MailWhitelistSender(mailSender, config);
-                    }
-                    if (config.devHooks && config.devHooks.divertEmailTo) {
-                        mailSender = new mail_diverter_1.MailDiverter(mailSender, config);
-                    }
-                    if (config.devHooks && config.devHooks.emailSubjectPrefix) {
-                        mailSender = new mail_subject_sender_1.MailSubjectSender(mailSender, config);
+                    if (config.devHooks) {
+                        if (config.devHooks.emailWhitelist) {
+                            mailSender = new mail_whitelist_sender_1.MailWhitelistSender(mailSender, config);
+                        }
+                        if (config.devHooks.divertEmailTo) {
+                            mailSender = new mail_diverter_1.MailDiverter(mailSender, config);
+                        }
+                        if (config.devHooks.emailSubjectPrefix) {
+                            mailSender = new mail_subject_sender_1.MailSubjectSender(mailSender, config);
+                        }
                     }
                     return mailSender;
                 },

package/dist/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondomob/gae-node-nestjs",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "description": "Google App Engine datastore repositories and graphql setup with nestjs",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -93,7 +93,7 @@
     "@types/passport-saml": "1.1.3",
     "@types/uuid": "8.3.1",
     "chokidar": "3.5.2",
-    "express": "4.17.1",
+    "express": "4.17.3",
     "jest": "27.3.1",
     "prettier": "2.4.1",
     "rxjs": "7.4.0",

package/server-start.js

@@ -35,11 +35,7 @@ class BunyanStream {
     const component = rec.component || rec.name;
     const service = rec.service ? `/${rec.service}` : '';
     const componentColor = componentColors[component] || colors.white;
-    console.log(
-      `${formattedTime} ${componentColor(component + service)} ${levelColor(
-        level + ':',
-      )} ${message}`,
-    );
+    console.log(`${formattedTime} ${componentColor(component + service)} ${levelColor(level + ':')} ${message}`);
   }
 }
 
@@ -47,11 +43,7 @@ const { logger, loggingStream } = setupLogging();
 
 const { buildEvents, stopWebpack } = setupWebpack(logger);
 
-const { stopServer, startServer } = setupServer(
-  logger,
-  loggingStream,
-  buildEvents,
-);
+const { stopServer, startServer } = setupServer(logger, loggingStream, buildEvents);
 
 const { stopDatastore, startDatastore } = setupDatastore(logger, buildEvents);
 const { startDsui, stopDsui } = setupDsui(logger);
@@ -61,7 +53,7 @@ startDatastore();
 startDsui();
 
 // Handle process stop
-process.on('SIGINT', async function() {
+process.on('SIGINT', async function () {
   logger.info('Caught interrupt signal');
 
   await Promise.all([stopWebpack(), stopDatastore(), stopDsui(), stopServer()]);
@@ -71,19 +63,16 @@ process.on('SIGINT', async function() {
 });
 
 // reload server on graphqls or config files change
-chokidar.watch(['./src/**/*.graphqls', './config/**/*.json'])
-  .on('all', (event, path) => {
-    if (event === 'add') {
-      console.log('added to watch list:', path);
-    } else if (event === 'change') {
-      console.log('file changed:', path);
-      stopServer()
-        .then(() => {
-          startServer();
-        })
-    }
-  });
-
+chokidar.watch(['./src/**/*.graphqls', './config/**/*.json']).on('all', (event, path) => {
+  if (event === 'add') {
+    console.log('added to watch list:', path);
+  } else if (event === 'change') {
+    console.log('file changed:', path);
+    stopServer().then(() => {
+      startServer();
+    });
+  }
+});
 
 function setupLogging() {
   const loggingStream = new BunyanStream();
@@ -216,9 +205,7 @@ function setupServer(logger, loggingStream, buildEvents) {
 
     child.once('close', () => {
       child = undefined;
-      serverLogger.warn(
-        'Server crashed waiting for restart trigger to restart',
-      );
+      serverLogger.warn('Server crashed waiting for restart trigger to restart');
       buildEvents.removeListener('reload', hotReload);
       buildEvents.once('reload', startServer);
     });
@@ -255,7 +242,7 @@ function setupDsui(logger) {
       let body = '';
       http.get(
         {
-          hostname: 'localhost',
+          hostname: '127.0.0.1',
           port: DATASTORE_PORT,
           path: '/',
           agent: false,
@@ -268,13 +255,7 @@ function setupDsui(logger) {
             if (res.statusCode == 200) {
               dsuiLogger.info('Datastore emulator is ready, starting DSUI');
               clearInterval(timeout);
-              const gcloud = spawn('gcloud', [
-                'beta',
-                'emulators',
-                'datastore',
-                'env-init',
-                '--format=json',
-              ]);
+              const gcloud = spawn('gcloud', ['beta', 'emulators', 'datastore', 'env-init', '--format=json']);
               gcloud.stdout.on('data', data => {
                 const datastoreConfig = JSON.parse(data);
                 _.forEach(datastoreConfig, (value, key) => {
@@ -326,13 +307,7 @@ function setupDatastore(logger, buildEvents) {
   let datastore;
   const startDatastore = () => {
     datastoreLogger.info('Starting datastore emulator');
-    datastore = spawn('gcloud', [
-      'beta',
-      'emulators',
-      'datastore',
-      'start',
-      `--host-port=localhost:${DATASTORE_PORT}`,
-    ]);
+    datastore = spawn('gcloud', ['beta', 'emulators', 'datastore', 'start', `--host-port=127.0.0.1:${DATASTORE_PORT}`]);
 
     datastore.stdout.on('data', data => {
       let string = data.toString('utf8');