Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
fix: dropbox storage provider login issues (#3624)
Igor Dykhtae8a644e48c6e
diff --git a/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js b/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.jsindex 8f298ee00..7fccb765d 100644--- a/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js+++ b/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js@@ -3,6 +3,7 @@// DROPBOXimport {Dropbox} from 'dropbox';+import Window from 'global/window';import DropboxIcon from './dropbox-icon';import {MAP_URI} from '../../constants/default-settings';import {KEPLER_FORMAT, Provider} from '@kepler.gl/cloud-providers';@@ -107,6 +108,10 @@ export default class DropboxProvider extends Provider {async listMaps() {// list filestry {+ const token = this.getAccessToken();+ if (!token) {+ throw new Error('Not logged in to Dropbox');+ }// https://dropbox.github.io/dropbox-sdk-js/Dropbox.html#filesListFolder__anchorconst response = await this._dropbox.filesListFolder({path: `${this._path}`@@ -189,16 +194,22 @@ export default class DropboxProvider extends Provider {* @param loadParams*/async downloadMap(loadParams) {- const {path} = loadParams;- const result = await this._dropbox.filesDownload({path});- const json = await this._readFile(result.fileBlob);-- const response = {- map: json,- format: KEPLER_FORMAT- };+ try {+ const token = this.getAccessToken();+ if (!token) {+ throw new Error('Not logged in to Dropbox');+ }+ const {path} = loadParams;+ const result = await this._dropbox.filesDownload({path});+ const json = await this._readFile(result.fileBlob);- return Promise.resolve(response);+ return {+ map: json,+ format: KEPLER_FORMAT+ };+ } catch (error) {+ throw this._handleDropboxError(error);+ }}getUserName() {@@ -211,7 +222,13 @@ export default class DropboxProvider extends Provider {}async logout() {- await this._dropbox.authTokenRevoke();+ try {+ if (this.getAccessToken()) {+ await this._dropbox.authTokenRevoke();+ }+ } catch (err) {+ // Ignore revoke failures (e.g. already-invalid token)+ }if (Window.localStorage) {Window.localStorage.removeItem('dropbox');}@@ -290,11 +307,32 @@ export default class DropboxProvider extends Provider {}async getUser() {- const response = await this._dropbox.usersGetCurrentAccount();- return this._getUserFromAccount(response);+ const token = this.getAccessToken();+ if (!token) {+ return null;+ }+ try {+ const response = await this._dropbox.usersGetCurrentAccount();+ return this._getUserFromAccount(response);+ } catch (error) {+ throw this._handleDropboxError(error);+ }}_handleDropboxError(error) {+ const summary =+ (error && error.error && error.error.error_summary) ||+ (typeof error?.message === 'string' ? error.message : '');++ // Stale / revoked token left in localStorage — clear so Login is shown again+ if (typeof summary === 'string' && /invalid_access_token/i.test(summary)) {+ if (Window.localStorage) {+ Window.localStorage.removeItem('dropbox');+ }+ this._initializeDropbox();+ return new Error('Dropbox session expired. Please log in again.');+ }+// dropbox list_folder errorif (error && error.error && error.error.error_summary) {return new Error(`Dropbox Error: ${error.error.error_summary}`);diff --git a/src/components/src/modals/cloud-tile.tsx b/src/components/src/modals/cloud-tile.tsxindex 43f3d1e7c..89c5c77d8 100644--- a/src/components/src/modals/cloud-tile.tsx+++ b/src/components/src/modals/cloud-tile.tsx@@ -126,30 +126,47 @@ const CloudTile: React.FC<CloudTileProps> = ({provider, actionName}) => {if (!provider) {return;}+ let cancelled = false;setError(null);setIsLoading(true);- setError(null);provider.getUser()- .then(setUser)- .catch(setError)+ .then(nextUser => {+ if (!cancelled) {+ setUser(nextUser);+ }+ })+ .catch(err => {+ if (!cancelled) {+ setUser(null);+ setError(err as Error);+ }+ }).finally(() => {- setError(null);- setIsLoading(false);+ if (!cancelled) {+ setIsLoading(false);+ }});+ return () => {+ cancelled = true;+ };}, [provider]);const onLogin = useCallback(async () => {setError(null);setIsLoading(true);try {- const user = await provider.login();- setUser(user);+ const nextUser = await provider.login();+ setUser(nextUser);setProvider(provider);+ return nextUser;} catch (error) {+ // Swallow: also used as LoginButton onClick (must not reject)setError(error as Error);+ return null;+ } finally {+ setIsLoading(false);}- setIsLoading(false);}, [provider, setProvider]);const onSelect = useCallback(async () => {@@ -160,13 +177,11 @@ const CloudTile: React.FC<CloudTileProps> = ({provider, actionName}) => {setProvider(provider);return;}- try {- await onLogin();- setProvider(provider);- } catch (err) {- setError(err as Error);+ const nextUser = await onLogin();+ if (!nextUser) {setProvider(null);}+ // onLogin already selected the provider on success}, [setProvider, provider, user, isLoading, onLogin]);const onLogout = useCallback(async () => {