Procházet zdrojové kódy

debug: see if excluding cookies for onedrive fixes large header issue

ifedapoolarewaju před 5 roky
rodič
revize
c6fbae5a9d

+ 3 - 1
packages/@uppy/companion/src/server/controllers/send-token.js

@@ -17,7 +17,9 @@ const versionCmp = require('../helpers/version')
 module.exports = function sendToken (req, res, next) {
 module.exports = function sendToken (req, res, next) {
   const uppyAuthToken = req.companion.authToken
   const uppyAuthToken = req.companion.authToken
   // add the token to cookies for thumbnail/image requests
   // add the token to cookies for thumbnail/image requests
-  tokenService.addToCookies(res, uppyAuthToken, req.companion.options, req.companion.provider.authProvider)
+  if (req.companion.provider.authProvider !== 'microsoft') {
+    tokenService.addToCookies(res, uppyAuthToken, req.companion.options, req.companion.provider.authProvider)
+  }
 
 
   const state = (req.session.grant || {}).state
   const state = (req.session.grant || {}).state
   if (state) {
   if (state) {

+ 8 - 8
website/src/examples/dashboard/app.es6

@@ -6,7 +6,7 @@ const GoogleDrive = require('@uppy/google-drive')
 const Dropbox = require('@uppy/dropbox')
 const Dropbox = require('@uppy/dropbox')
 const Instagram = require('@uppy/instagram')
 const Instagram = require('@uppy/instagram')
 const Facebook = require('@uppy/facebook')
 const Facebook = require('@uppy/facebook')
-// const OneDrive = require('@uppy/onedrive')
+const OneDrive = require('@uppy/onedrive')
 const Url = require('@uppy/url')
 const Url = require('@uppy/url')
 const Webcam = require('@uppy/webcam')
 const Webcam = require('@uppy/webcam')
 const Tus = require('@uppy/tus')
 const Tus = require('@uppy/tus')
@@ -123,13 +123,13 @@ function uppySetOptions () {
     window.uppy.removePlugin(FacebookInstance)
     window.uppy.removePlugin(FacebookInstance)
   }
   }
 
 
-  // const OneDriveInstance = window.uppy.getPlugin('OneDrive')
-  // if (opts.OneDrive && !OneDriveInstance) {
-  //   window.uppy.use(OneDrive, { target: Dashboard, companionUrl: COMPANION })
-  // }
-  // if (!opts.OneDrive && OneDriveInstance) {
-  //   window.uppy.removePlugin(OneDriveInstance)
-  // }
+  const OneDriveInstance = window.uppy.getPlugin('OneDrive')
+  if (opts.OneDrive && !OneDriveInstance) {
+    window.uppy.use(OneDrive, { target: Dashboard, companionUrl: COMPANION })
+  }
+  if (!opts.OneDrive && OneDriveInstance) {
+    window.uppy.removePlugin(OneDriveInstance)
+  }
 
 
   const WebcamInstance = window.uppy.getPlugin('Webcam')
   const WebcamInstance = window.uppy.getPlugin('Webcam')
   if (opts.Webcam && !WebcamInstance) {
   if (opts.Webcam && !WebcamInstance) {

+ 3 - 3
website/src/examples/dashboard/app.html

@@ -14,7 +14,7 @@
     <li><label for="opts-Dropbox"><input type="checkbox" id="opts-Dropbox" checked/> Dropbox</label></li>
     <li><label for="opts-Dropbox"><input type="checkbox" id="opts-Dropbox" checked/> Dropbox</label></li>
     <li><label for="opts-Instagram"><input type="checkbox" id="opts-Instagram" checked/> Instagram</label></li>
     <li><label for="opts-Instagram"><input type="checkbox" id="opts-Instagram" checked/> Instagram</label></li>
     <li id="facebook-checkbox"><label for="opts-Facebook"><input type="checkbox" id="opts-Facebook" checked/> Facebook</label></li>
     <li id="facebook-checkbox"><label for="opts-Facebook"><input type="checkbox" id="opts-Facebook" checked/> Facebook</label></li>
-    <!-- <li><label for="opts-OneDrive"><input type="checkbox" id="opts-OneDrive" checked/> OneDrive</label></li> -->
+    <li><label for="opts-OneDrive"><input type="checkbox" id="opts-OneDrive" checked/> OneDrive</label></li>
     <li><label for="opts-Url"><input type="checkbox" id="opts-Url" checked/> Url</label></li>
     <li><label for="opts-Url"><input type="checkbox" id="opts-Url" checked/> Url</label></li>
   </ul>
   </ul>
 
 
@@ -41,7 +41,7 @@
     Dropbox: document.querySelector('#opts-Dropbox'),
     Dropbox: document.querySelector('#opts-Dropbox'),
     Instagram: document.querySelector('#opts-Instagram'),
     Instagram: document.querySelector('#opts-Instagram'),
     Facebook: document.querySelector('#opts-Facebook'),
     Facebook: document.querySelector('#opts-Facebook'),
-    // OneDrive: document.querySelector('#opts-OneDrive'),
+    OneDrive: document.querySelector('#opts-OneDrive'),
     Url: document.querySelector('#opts-Url'),
     Url: document.querySelector('#opts-Url'),
     autoProceed: document.querySelector('#opts-autoProceed'),
     autoProceed: document.querySelector('#opts-autoProceed'),
     restrictions: document.querySelector('#opts-restrictions'),
     restrictions: document.querySelector('#opts-restrictions'),
@@ -54,7 +54,7 @@
     GoogleDrive: true,
     GoogleDrive: true,
     Instagram: true,
     Instagram: true,
     Dropbox: true,
     Dropbox: true,
-    // OneDrive: true,
+    OneDrive: true,
     Facebook: false,
     Facebook: false,
     Url: true,
     Url: true,
     autoProceed: false,
     autoProceed: false,