From 6ab626fc0dcb4ce62345c9ee967ba300474728e2 Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 6 Feb 2021 09:20:07 +0100 Subject: [PATCH] :sparkles: convertBigIntToString --- dist/util/checkToken.d.ts | 2 +- dist/util/convertBigIntToString.d.ts | 2 ++ dist/util/convertBigIntToString.js | 16 ++++++++++++++++ dist/util/convertBigIntToString.js.map | 1 + package-lock.json | Bin 31022 -> 66316 bytes package.json | 3 ++- src/util/checkToken.ts | 2 +- src/util/convertBigIntToString.ts | 13 +++++++++++++ 8 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 dist/util/convertBigIntToString.d.ts create mode 100644 dist/util/convertBigIntToString.js create mode 100644 dist/util/convertBigIntToString.js.map create mode 100644 src/util/convertBigIntToString.ts diff --git a/dist/util/checkToken.d.ts b/dist/util/checkToken.d.ts index 478d382a0..f8dcbe129 100644 --- a/dist/util/checkToken.d.ts +++ b/dist/util/checkToken.d.ts @@ -1 +1 @@ -export declare function checkToken(token: string): Promise; +export declare function checkToken(token: string): Promise; diff --git a/dist/util/convertBigIntToString.d.ts b/dist/util/convertBigIntToString.d.ts new file mode 100644 index 000000000..b0efd9c4c --- /dev/null +++ b/dist/util/convertBigIntToString.d.ts @@ -0,0 +1,2 @@ +import "missing-native-js-functions"; +export declare function convertBigIntToString(obj: any): any; diff --git a/dist/util/convertBigIntToString.js b/dist/util/convertBigIntToString.js new file mode 100644 index 000000000..a72b5a571 --- /dev/null +++ b/dist/util/convertBigIntToString.js @@ -0,0 +1,16 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.convertBigIntToString = void 0; +require("missing-native-js-functions"); +function convertBigIntToString(obj) { + if (typeof obj === "bigint") + obj = obj.toString(); + if (typeof obj === "object") { + obj.keys().forEach((key) => { + obj[key] = convertBigIntToString(obj[key]); + }); + } + return obj; +} +exports.convertBigIntToString = convertBigIntToString; +//# sourceMappingURL=convertBigIntToString.js.map \ No newline at end of file diff --git a/dist/util/convertBigIntToString.js.map b/dist/util/convertBigIntToString.js.map new file mode 100644 index 000000000..010706aa0 --- /dev/null +++ b/dist/util/convertBigIntToString.js.map @@ -0,0 +1 @@ +{"version":3,"file":"convertBigIntToString.js","sourceRoot":"","sources":["../../src/util/convertBigIntToString.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAErC,SAAgB,qBAAqB,CAAC,GAAQ;IAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAElD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC5B,GAAG,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;YAClC,GAAG,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;KACH;IAED,OAAO,GAAG,CAAC;AACZ,CAAC;AAVD,sDAUC"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 6a78da57de1185f95cfd92c70ec29935a816b3bf..267e87120e329194c4bd54bef1b60a98581b7650 100644 GIT binary patch delta 6736 zcmcIp3s4m29iLNF4nzd+1s;Nj6jAT?9>DPy1Qfv_Z$S;Xcefl1w-5IAM6^*S)3K>d zD)6@*(nbVKz4iX+M%6c zhP&_oegDVr|NOo?_p#y06A5EY&E73ZMu$KR$7q3yI?8fHAx23{JQ*A!!+7aPlF{fu zB9%pajtw3SgSY<#83x(O|NCZRYH<7afsKJciFXLe#-J zaQn?LX0U{1mhQP@)#4~mMG2M*VMTg9g)a2xEt;caa!{ao5%We=mrv%61YrIS>1-dv zg<=uJXqI09&SqN2zjXz|5evM$Bs)d1X==={+7O=v*O%PEl;1A(D-S_(!X4GhzY;#M zC>SG8u%a_SM#0l%h9%3dNvzsKR3H|X)Gu6!3dM$LcHVK4$7V68s>~^Nxm|88GvVIy z3uc9AB$O&HbPmG!0W`US-L&@uq6!$4Q^zy_b`>sac)P z%z)gL=WAu}YS`g+6}vp8ns%HD*x}b954cj7LutxWSmYm5Dl(MX$NKwG>;{FP&kJv^ zFhSv}v2q>hn>56NGj%Pzzv{Bex`dg2YD&{L6vd!6S9Umt z!rTgk`C_%Mif)%CaL{5gfzfgoskdRGF#-OxDP09fk@XX-dxb4aMd`7@2kw*Ri&%1CZbalnF)q9|0yd5t!ZZHX!pT;YrlzQecfKN zNLg^z{)x)qH?v+bDTIe9(aCed#Cj{hx=V`{*qeO=>)x32Y=sU^T1iGs{UgU9SJ|bG z{OvlNq@t%4ZZt(v{-Q#Z{T66(Tu~vCk^2Hxxx$tVf62{Lx`t*4D1nBt12$N{;a94Y zA8mLcO@SpHr4HfheY?*GGkIM}_o;B&kPmymgp2xAS$=_`Ti2-h_Q>*#)B#ZaaH005 z8C`=TB#^B(`0B>juu-=Tt$_UnOzM3_P@fwd!G(UN;0?UzOH#(Us3LvD7uMlzgJ|{?_ru{i(tqhxw!a?e~C>s`PVjUbVN_TpLRE4 zD25Y8oje+#B*l+Fzbzd#77xTq)tzxmne4s%^6W*;056r>VX)i=Z4Ls>u2tYj%;91s z?uOcyZ4DGvTG!g%*;pL)7dAx)+I-)h*ZKD@1)Xk+-+%1R0PIKwIoSKNq;^bm>ye$IhGCiLH6 zt?6ct4Rd&UmoEt@On}W!1g`QII3speJ?+L)d>Ua6TK&*!|^}Sed%68ka**n$4C%mqvIu%aBgu~ZFDQ2K)`=7Co zN_LbQDl~jlsCR{#+S+J06fBGb0^^TlDPg(qm1W2)2$JDOAM#5Y+-^u7|GOE|cFO4d z4}#YgKX?fSjyr82HeKANi>9vKP`+yhr-Ad4uXHX3KxQ~b38PA^ zuJcX0VJ+R?<|=O7nnv)XIN%(jMnQ_crF$;v-w8F<;wktZWr3sRKFH|qP!4dwbia#z z5a?O74{q(V!qYu>RRT`!y@v%nv+r$Rd~*eg43U8d<&28xBcn{i2L<|?IDrmNJ*vLo zJ>L5{mOjx}snTn@@0|X~s_!c}aX>Be2q{-3CSWqk(STYE%m^lFh@784;$wl#{aB^w zmxB_3RyY}2ryrl%AwC(pF>AAK)6;1A1e~U1m7edn>#L+0n{c`R_F`GQ9)3p!*)s!b z5WhixU$w_K_%@CV>rkGGQZXbAR~xoEj-m%!?My`xOS9p=5EVo(j_TXS14?w<$UV-; zm&l{+SgS@S({!&$3UN~?fL|Dx?r*c#e~My@|KNPxhri8J_|luvR$0 zClU|n-47A~r}pN;vwSjqt$ZW=b*}@DeB`qAkU1>Nm}WEK#o=tYI=rrOcIwhFQsenz zV%a*d3-V?DL&2h-z$Gq^U)zOXjNXlRa}cA!xod;;5ht?IAx7ob|NErb?JEwG1!bR(#b~&`#|-a?ukD;KCrJM66%~;~k~Zkq36Vf)P2dHrPW%!x zGC&6hP*bWF$gI y;Vo|lyq875^CM@JuS=t3>@W`O_CrtLM80*XYO*i4eBmv$>;H2LouVqPRQwxn&;7;# delta 160 zcmeBaV_El!ae}v)p$-?PQc-GQX=YJsv67WSNl|I44%cKs7SYWiT|Cy4XD-p7+<(+= zG7GyxQb0j&fxDNZah`FBabbCCNv?B5XnC$rK&GWficyMru1AtbxtX?8d2vOApMO|o zV2D$hv88#1wp)2pq;am7Q&@OFMzE`URgkG+YI<&kNmNv>QAE0}tr8a}XD!ejoJx}$ MU2bjGJpR}k0P?6cegFUf diff --git a/package.json b/package.json index 91e82f3af..049fdd2ab 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "homepage": "https://github.com/discord-open-source/discord-server-util#readme", "dependencies": { "jsonwebtoken": "^8.5.1", - "lambert-db": "^1.1.4" + "lambert-db": "^1.1.4", + "missing-native-js-functions": "^1.2.1" }, "devDependencies": { "@types/jsonwebtoken": "^8.5.0", diff --git a/src/util/checkToken.ts b/src/util/checkToken.ts index 96c7806ad..b46351264 100644 --- a/src/util/checkToken.ts +++ b/src/util/checkToken.ts @@ -2,7 +2,7 @@ import { JWTOptions } from "./Constants"; import jwt from "jsonwebtoken"; import Config from "./Config"; -export function checkToken(token: string) { +export function checkToken(token: string): Promise { return new Promise((res, rej) => { jwt.verify(token, Config.getAll().api.security.jwtSecret, JWTOptions, (err, decoded: any) => { if (err || !decoded) return rej("Invalid Token"); diff --git a/src/util/convertBigIntToString.ts b/src/util/convertBigIntToString.ts new file mode 100644 index 000000000..2c8d9a383 --- /dev/null +++ b/src/util/convertBigIntToString.ts @@ -0,0 +1,13 @@ +import "missing-native-js-functions"; + +export function convertBigIntToString(obj: any) { + if (typeof obj === "bigint") obj = obj.toString(); + + if (typeof obj === "object") { + obj.keys().forEach((key: string) => { + obj[key] = convertBigIntToString(obj[key]); + }); + } + + return obj; +}