@riocrypto/common-server 1.0.2614 → 1.0.2616
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Request, Response, NextFunction } from "express";
|
|
2
|
+
import { Mongoose } from "mongoose";
|
|
2
3
|
declare global {
|
|
3
4
|
namespace Express {
|
|
4
5
|
interface Request {
|
|
@@ -15,4 +16,4 @@ declare global {
|
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
}
|
|
18
|
-
export declare const authContextMiddleware: (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
19
|
+
export declare const authContextMiddleware: (req: Request, res: Response, next: NextFunction, mongoose: Mongoose) => Promise<void>;
|
|
@@ -14,14 +14,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.authContextMiddleware = void 0;
|
|
16
16
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
17
|
-
const mongoose_1 = __importDefault(require("mongoose"));
|
|
18
17
|
const common_1 = require("@riocrypto/common");
|
|
19
18
|
const secret_manager_client_1 = require("../clients/secret-manager-client");
|
|
20
19
|
const admin_auth_1 = require("../models/admin-auth");
|
|
21
20
|
const auth_1 = require("../models/auth");
|
|
22
21
|
let cachedAdminSecret = null;
|
|
23
22
|
let cachedUserSecret = null;
|
|
24
|
-
const authContextMiddleware = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
|
+
const authContextMiddleware = (req, res, next, mongoose) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
24
|
const { adminAccessToken, accessToken } = req.cookies;
|
|
26
25
|
if (adminAccessToken) {
|
|
27
26
|
try {
|
|
@@ -30,7 +29,7 @@ const authContextMiddleware = (req, res, next) => __awaiter(void 0, void 0, void
|
|
|
30
29
|
}
|
|
31
30
|
if (cachedAdminSecret) {
|
|
32
31
|
const decoded = jsonwebtoken_1.default.verify(adminAccessToken, cachedAdminSecret);
|
|
33
|
-
const AdminAuth = (0, admin_auth_1.buildAdminAuth)(
|
|
32
|
+
const AdminAuth = (0, admin_auth_1.buildAdminAuth)(mongoose);
|
|
34
33
|
const adminAuth = yield AdminAuth.findById(decoded.id);
|
|
35
34
|
if (adminAuth) {
|
|
36
35
|
req.adminContext = {
|
|
@@ -50,7 +49,7 @@ const authContextMiddleware = (req, res, next) => __awaiter(void 0, void 0, void
|
|
|
50
49
|
}
|
|
51
50
|
if (cachedUserSecret) {
|
|
52
51
|
const decoded = jsonwebtoken_1.default.verify(accessToken, cachedUserSecret);
|
|
53
|
-
const Auth = (0, auth_1.buildAuth)(
|
|
52
|
+
const Auth = (0, auth_1.buildAuth)(mongoose);
|
|
54
53
|
const auth = yield Auth.findById(decoded.id);
|
|
55
54
|
if (auth) {
|
|
56
55
|
req.userContext = {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Fiat, FXProvider, FXTradeStatus, Side, Crypto } from "@riocrypto/common";
|
|
1
|
+
import { Fiat, FXProvider, FXTradeStatus, Side, Crypto, EmarketsSettlementType, TransnetworkSettlementType } from "@riocrypto/common";
|
|
2
2
|
import { Mongoose, Model, Document } from "mongoose";
|
|
3
3
|
interface FXTradeAttrs {
|
|
4
4
|
createdAt: Date;
|
|
@@ -6,6 +6,7 @@ interface FXTradeAttrs {
|
|
|
6
6
|
orderIds: string[];
|
|
7
7
|
amount: number;
|
|
8
8
|
fiat: Fiat;
|
|
9
|
+
settlementType?: EmarketsSettlementType | TransnetworkSettlementType;
|
|
9
10
|
averageOfferedPrice: number;
|
|
10
11
|
amountTraded: number;
|
|
11
12
|
price?: number;
|
|
@@ -27,6 +28,7 @@ interface FXTradeDoc extends Document {
|
|
|
27
28
|
amount: number;
|
|
28
29
|
fiat: Fiat;
|
|
29
30
|
amountTraded: number;
|
|
31
|
+
settlementType?: EmarketsSettlementType | TransnetworkSettlementType;
|
|
30
32
|
averageOfferedPrice: number;
|
|
31
33
|
price?: number;
|
|
32
34
|
provider: FXProvider;
|
package/build/models/fx-trade.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@riocrypto/common-server",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.2616",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./build/index.js",
|
|
6
6
|
"types": "./build/index.d.ts",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"@google-cloud/secret-manager": "^5.3.0",
|
|
29
29
|
"@google-cloud/storage": "^6.9.5",
|
|
30
30
|
"@hyperdx/node-opentelemetry": "^0.7.0",
|
|
31
|
-
"@riocrypto/common": "^1.0.
|
|
31
|
+
"@riocrypto/common": "^1.0.2417",
|
|
32
32
|
"@types/express": "^4.17.13",
|
|
33
33
|
"axios": "^1.7.4",
|
|
34
34
|
"crypto-js": "^4.2.0",
|