companion,provider-views: set default version if none is set

also encode versions sent through query params
transloadit · Jun 5, 2019 · 93e0e5f · 93e0e5f
1 parent d647e89
commit 93e0e5f
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/@uppy/companion/src/uppy.js b/packages/@uppy/companion/src/uppy.js
@@ -233,7 +233,7 @@ const getOptionsMiddleware = (options) => {
       options,
       s3Client,
       authToken: req.header('uppy-auth-token') || req.query.uppyAuthToken,
-      clientVersion: req.header('uppy-versions') || req.query.uppyVersions,
+      clientVersion: req.header('uppy-versions') || decodeURIComponent(req.query.uppyVersions) || '1.0.0',
       buildURL: getURLBuilder(options)
     }
     next()

diff --git a/packages/@uppy/companion/test/__tests__/companion.js b/packages/@uppy/companion/test/__tests__/companion.js
@@ -12,11 +12,15 @@ jest.mock('../../src/server/helpers/oauth-state', () => {
       }
 
       if (state === 'state-with-older-version' && key === 'clientVersion') {
-        return '@uppy/companion-client:1.0.1'
+        return '@uppy/companion-client=1.0.1'
       }
 
       if (state === 'state-with-newer-version' && key === 'clientVersion') {
-        return '@uppy/companion-client:1.0.3'
+        return '@uppy/companion-client=1.0.3'
+      }
+
+      if (state === 'state-with-newer-version-old-style' && key === 'clientVersion') {
+        return 'companion-client:1.0.2'
       }
 
       return 'http://localhost:3020'
@@ -111,7 +115,7 @@ describe('test authentication', () => {
       })
   })
 
-  test('the token gets sent to html based on version', () => {
+  test('the token gets to older clients without stringify', () => {
     // see mock ../../src/server/helpers/oauth-state above for state values
     return request(authServer)
       .get(`/drive/send-token?uppyAuthToken=${token}&state=state-with-older-version`)
@@ -133,6 +137,28 @@ describe('test authentication', () => {
       })
   })
 
+  test('the token gets sent to newer clients with old version style', () => {
+    // see mock ../../src/server/helpers/oauth-state above for state values
+    return request(authServer)
+      .get(`/drive/send-token?uppyAuthToken=${token}&state=state-with-newer-version-old-style`)
+      .expect(200)
+      .expect((res) => {
+        const body = `
+    <!DOCTYPE html>
+    <html>
+    <head>
+        <meta charset="utf-8" />
+        <script>
+          window.opener.postMessage(JSON.stringify({token: "${token}"}), "http://localhost:3020")
+          window.close()
+        </script>
+    </head>
+    <body></body>
+    </html>`
+        expect(res.text).toBe(body)
+      })
+  })
+
   test('logout provider', () => {
     return request(authServer)
       .get('/drive/logout/')

diff --git a/packages/@uppy/companion/tsconfig.json b/packages/@uppy/companion/tsconfig.json
@@ -7,9 +7,7 @@
     "sourceMap": false,
     "allowJs": true,
     "checkJs": true,
-    "noEmitOnError": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true
+    "noEmitOnError": true
   },
   "include": [
     "src/**/*"

diff --git a/packages/@uppy/provider-views/src/index.js b/packages/@uppy/provider-views/src/index.js
@@ -420,7 +420,7 @@ module.exports = class ProviderView {
   handleAuth () {
     const authState = btoa(JSON.stringify({ origin: getOrigin() }))
     // @todo remove this hardcoded version
-    const clientVersion = 'companion-client:1.0.2'
+    const clientVersion = encodeURIComponent('@uppy/companion-client=1.0.2')
     const link = `${this.provider.authUrl()}?state=${authState}&uppyVersions=${clientVersion}`
 
     const authWindow = window.open(link, '_blank')