Преглед на файлове

Merge pull request #1165 from transloadit/pin-grant

companion: pin grant to known stable version
Artur Paikin преди 6 години
родител
ревизия
78a4a91b50
променени са 2 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 1 1
      packages/@uppy/companion/package.json
  2. 1 2
      packages/@uppy/companion/src/server/controllers/callback.js

+ 1 - 1
packages/@uppy/companion/package.json

@@ -41,7 +41,7 @@
     "express-interceptor": "^1.2.0",
     "express-prom-bundle": "^3.1.0",
     "express-session": "1.15.6",
-    "grant-express": "^4.0.1",
+    "grant-express": "4.1.2",
     "helmet": "3.8.2",
     "isobject": "3.0.1",
     "jsonwebtoken": "^8.0.1",

+ 1 - 2
packages/@uppy/companion/src/server/controllers/callback.js

@@ -27,8 +27,7 @@ module.exports = function callback (req, res, next) {
   // add the token to cookies for thumbnail/image requests
   tokenService.addToCookies(res, uppyAuthToken, req.uppy.options)
 
-  const grant = (req.session.grant || {})
-  const state = grant.dynamic ? grant.dynamic.state : grant.state
+  const state = (req.session.grant || {}).state
   if (state) {
     const origin = oAuthState.getFromState(state, 'origin', req.uppy.options.secret)
     const allowedClients = req.uppy.options.clients