Skip to content

Commit eabf6f6

Browse files
companion-client: use platform agnositc storage to store auth token
1 parent 3d89a0c commit eabf6f6

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

Diff for: packages/@uppy/companion-client/src/Provider.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@ module.exports = class Provider extends RequestClient {
1414
this.authProvider = opts.authProvider || this.provider
1515
this.name = this.opts.name || _getName(this.id)
1616
this.tokenKey = `companion-${this.id}-auth-token`
17+
this.storage = opts.storage || localStorage
1718
}
1819

1920
get defaultHeaders () {
20-
return Object.assign({}, super.defaultHeaders, {'uppy-auth-token': localStorage.getItem(this.tokenKey)})
21+
return Object.assign({}, super.defaultHeaders, {'uppy-auth-token': this.storage.getItem(this.tokenKey)})
2122
}
2223

2324
// @todo(i.olarewaju) consider whether or not this method should be exposed
2425
setAuthToken (token) {
2526
// @todo(i.olarewaju) add fallback for OOM storage
26-
localStorage.setItem(this.tokenKey, token)
27+
this.storage.setItem(this.tokenKey, token)
2728
}
2829

2930
checkAuth () {
@@ -48,7 +49,7 @@ module.exports = class Provider extends RequestClient {
4849
logout (redirect = location.href) {
4950
return this.get(`${this.id}/logout?redirect=${redirect}`)
5051
.then((res) => {
51-
localStorage.removeItem(this.tokenKey)
52+
this.storage.removeItem(this.tokenKey)
5253
return res
5354
})
5455
}

Diff for: packages/@uppy/dropbox/src/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module.exports = class Dropbox extends Plugin {
2020
this.provider = new Provider(uppy, {
2121
serverUrl: this.opts.serverUrl,
2222
serverHeaders: this.opts.serverHeaders,
23+
storage: this.opts.storage,
2324
provider: 'dropbox'
2425
})
2526

Diff for: packages/@uppy/google-drive/src/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ module.exports = class GoogleDrive extends Plugin {
2323
this.provider = new Provider(uppy, {
2424
serverUrl: this.opts.serverUrl,
2525
serverHeaders: this.opts.serverHeaders,
26+
storage: this.opts.storage,
2627
provider: 'drive',
2728
authProvider: 'google'
2829
})

Diff for: packages/@uppy/instagram/src/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module.exports = class Instagram extends Plugin {
2020
this.provider = new Provider(uppy, {
2121
serverUrl: this.opts.serverUrl,
2222
serverHeaders: this.opts.serverHeaders,
23+
storage: this.opts.storage,
2324
provider: 'instagram',
2425
authProvider: 'instagram'
2526
})

0 commit comments

Comments
 (0)