Fix overloaded jar in CSRF and wss based methods (#419)

* Simplify jar overloading by permitting strings * Make getCurrentUser() options case-insensitive * Fix overloaded jar in CSRF and wss based methods * Trigger Build Co-authored-by: suufi <[email protected]> Co-authored-by: Neztore <[email protected]>
noblox · Sep 23, 2021 · ddb663d · ddb663d
1 parent ef5377e
commit ddb663d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lib/user/onNotification.js b/lib/user/onNotification.js
@@ -27,6 +27,9 @@ exports.func = function (args) {
   const max = settings.event.maxRetries
   const notifications = new events.EventEmitter()
   function connect (retries) {
+    if (typeof args.jar === 'string') {
+      args.jar = { session: args.jar }
+    }
     const session = getSession({ jar: args.jar })
     const client = new SignalR('wss://realtime.roblox.com/notifications', ['usernotificationhub'], 3, true) // wss for https
     client.headers.Cookie = '.ROBLOSECURITY=' + session + ';'

diff --git a/lib/util/getHash.js b/lib/util/getHash.js
@@ -20,7 +20,10 @@ exports.optional = ['jar']
 **/
 
 // Define
-exports.func = function (args) {
-  const session = getSession({ jar: args.jar })
+exports.func = function ({ jar }) {
+  if (typeof jar === 'string') {
+    jar = { session: jar }
+  }
+  const session = getSession({ jar })
   return crypto.createHash('md5').update(session).digest('hex')
 }
diff --git a/lib/util/getSession.js b/lib/util/getSession.js
@@ -21,6 +21,9 @@ exports.optional = ['jar']
 exports.func = function (args) {
   const jar = args.jar || options.jar
   if (settings.session_only) {
+    if (typeof jar === 'string') {
+      return jar
+    }
     return jar.session
   } else {
     const cookies = jar.getCookies('https://roblox.com')