@rpcbase/server 0.356.0-tsbundlerserver.0 → 0.356.0-tsbundlerserver.2

package/get_object_id.ts

@@ -1,5 +1,6 @@
-const assert = require("assert")
-const crypto = require("crypto")
+import assert from "assert";
+import crypto from "crypto";
+import mongoose from "./mongoose"
 
 import isHexadecimal from "validator/lib/isHexadecimal"
 
@@ -16,12 +17,12 @@ assert(isHexadecimal(RB_TENANT_ID), "expected RB_TENANT_ID to be a hexadecimal")
 assert(RB_TENANT_ID.length === 8, "RB_TENANT_ID must be exactly 4 bytes (8 hex chars)")
 
 // generates a 12 bytes mongodb object id using the org id prefix or custom customer id
-export const get_object_id = (): string => {
+export const get_object_id = (): mongoose.Types.ObjectId => {
   const ts_bytes = Math.floor(Date.now() / 1000).toString(16)
   expect(ts_bytes.length).toBe(8)
 
   const random_bytes = crypto.randomBytes(4).toString("hex")
 
   const obj_id = `${ts_bytes}${RB_TENANT_ID}${random_bytes}`
-  return obj_id
+  return new mongoose.Types.ObjectId(obj_id)
 }

package/mongoose/object_id_plugin.ts

@@ -1,13 +1,13 @@
-import mongoose, { Schema } from "mongoose"
+import mongoose, { Schema } from "./"
 
-import get_object_id from "../get_object_id"
+import {get_object_id} from "../get_object_id"
 
 export const object_id_plugin = (schema: Schema) => {
   if (!schema.path("_id")) {
     schema.add({
       _id: {
         type: mongoose.Types.ObjectId,
-        default: () => new mongoose.Types.ObjectId(get_object_id()),
+        default: () => get_object_id(),
       },
     })
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.356.0-tsbundlerserver.0",
+  "version": "0.356.0-tsbundlerserver.2",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "scripts": {

package/src/auth/reset_password.js

@@ -10,7 +10,6 @@ const get_random_str = require("@rpcbase/std/crypto/get_random_str")
 
 const mailer = require("../../mailer")
 const mongoose = require("../../mongoose")
-const get_object_id = require("../../get_object_id")
 const ResetPasswordToken = require("../models/ResetPasswordToken")
 
 const log = debug("rb:auth:reset_password")
@@ -39,7 +38,6 @@ const reset_password = async({email}, ctx) => {
   const token_hash = await hash_password(token)
 
   const reset_token = new ResetPasswordToken({
-    _id: get_object_id(),
     user_id: user._id,
     token_hash,
   })

package/src/auth/sign_up.js

@@ -1,13 +1,10 @@
 /* @flow */
 const {hash_password} = require("@rpcbase/std/crypto/hash")
 
-const get_object_id = require("../../get_object_id")
 const mongoose = require("../../mongoose")
 
 const UserStoredValues = require("../models/UserStoredValues")
 
-
-
 const MIN_PASSWORD_LENGTH = 12
 
 const sign_up = async(payload, ctx, session) => {
@@ -40,7 +37,6 @@ const sign_up = async(payload, ctx, session) => {
   const hash = await hash_password(password)
 
   const user = new User({
-    _id: get_object_id(),
     email,
     password_hash: hash
   })
@@ -50,7 +46,6 @@ const sign_up = async(payload, ctx, session) => {
   const user_id = user._id.toString()
 
   const values_store = new UserStoredValues({
-    _id: get_object_id(),
     _owners: [user_id]
   })