@jbrowse/plugin-authentication 4.3.0 → 5.0.0-beta.10

package/esm/DropboxOAuthModel/model.d.ts

@@ -1,197 +1,346 @@
 import type { DropboxOAuthInternetAccountConfigModel } from './configSchema.ts';
 import type { UriLocation } from '@jbrowse/core/util/types';
 import type { Instance } from '@jbrowse/mobx-state-tree';
-declare const stateModelFactory: (configSchema: DropboxOAuthInternetAccountConfigModel) => import("@jbrowse/mobx-state-tree").IModelType<{
+/**
+ * #stateModel DropboxOAuthInternetAccount
+ */
+declare const stateModelFactory: (configSchema: DropboxOAuthInternetAccountConfigModel) => import("@jbrowse/mobx-state-tree").IModelType<Omit<Omit<{
     id: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").ISimpleType<string>, [undefined]>;
     type: import("@jbrowse/mobx-state-tree").ISimpleType<string>;
-    configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-        name: {
-            description: string;
-            type: string;
+    configuration: import("@jbrowse/core/configuration/configurationSchema").IConfigurationReference<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+        readonly name: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        description: {
-            description: string;
-            type: string;
+        readonly description: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        authHeader: {
-            description: string;
-            type: string;
+        readonly authHeader: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        tokenType: {
-            description: string;
-            type: string;
+        readonly tokenType: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        domains: {
-            description: string;
-            type: string;
-            defaultValue: never[];
+        readonly domains: {
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
-    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "internetAccountId">>;
-} & {
-    type: import("@jbrowse/mobx-state-tree").ISimpleType<"OAuthInternetAccount">;
-    configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-        tokenType: {
-            description: string;
-            type: string;
+        type: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
+        internetAccountId: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "internetAccountId", true, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>>;
+}, "configuration" | "type"> & {
+    type: import("@jbrowse/mobx-state-tree").ILiteralType<"OAuthInternetAccount">;
+    configuration: import("@jbrowse/core/configuration/configurationSchema").IConfigurationReference<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         authEndpoint: {
-            description: string;
-            type: string;
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        tokenEndpoint: {
-            description: string;
-            type: string;
+        authHeader: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        clientId: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        description: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        domains: {
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
+        };
+        internetAccountId: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        name: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
         needsPKCE: {
-            description: string;
-            type: string;
+            type: "boolean";
+        } & {
             defaultValue: boolean;
         };
-        clientId: {
-            description: string;
-            type: string;
+        responseType: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
         scopes: {
-            description: string;
-            type: string;
+            type: "string";
+        } & {
             defaultValue: string;
         };
         state: {
-            description: string;
-            type: string;
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        responseType: {
-            description: string;
-            type: string;
+        tokenEndpoint: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        tokenType: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        type: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
     }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-        name: {
-            description: string;
-            type: string;
+        readonly name: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        description: {
-            description: string;
-            type: string;
+        readonly description: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        readonly authHeader: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        readonly tokenType: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        readonly domains: {
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
+        };
+        type: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        internetAccountId: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "internetAccountId", true, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>, undefined, true, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>>;
+}, "configuration" | "type"> & {
+    /**
+     * #property
+     */
+    type: import("@jbrowse/mobx-state-tree").ILiteralType<"DropboxOAuthInternetAccount">;
+    /**
+     * #property
+     */
+    configuration: import("@jbrowse/core/configuration/configurationSchema").IConfigurationReference<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+        authEndpoint: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
         authHeader: {
-            description: string;
-            type: string;
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        tokenType: {
-            description: string;
-            type: string;
+        clientId: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        description: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
         domains: {
-            description: string;
-            type: string;
-            defaultValue: never[];
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
-    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "internetAccountId">>, undefined>>;
-} & {
-    type: import("@jbrowse/mobx-state-tree").ISimpleType<"DropboxOAuthInternetAccount">;
-    configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-        authEndpoint: {
-            description: string;
-            type: string;
+        internetAccountId: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        tokenEndpoint: {
-            description: string;
-            type: string;
+        name: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
         needsPKCE: {
-            description: string;
-            type: string;
+            type: "boolean";
+        } & {
             defaultValue: boolean;
         };
-        domains: {
-            description: string;
-            type: string;
-            defaultValue: string[];
+        responseType: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        scopes: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        state: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        tokenEndpoint: {
+            type: "string";
+        } & {
+            defaultValue: string;
         };
-    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         tokenType: {
-            description: string;
-            type: string;
+            type: "string";
+        } & {
             defaultValue: string;
         };
+        type: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         authEndpoint: {
-            description: string;
-            type: string;
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        tokenEndpoint: {
-            description: string;
-            type: string;
+        authHeader: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        clientId: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        description: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        domains: {
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
+        };
+        internetAccountId: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        name: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
         needsPKCE: {
-            description: string;
-            type: string;
+            type: "boolean";
+        } & {
             defaultValue: boolean;
         };
-        clientId: {
-            description: string;
-            type: string;
+        responseType: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
         scopes: {
-            description: string;
-            type: string;
+            type: "string";
+        } & {
             defaultValue: string;
         };
         state: {
-            description: string;
-            type: string;
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        responseType: {
-            description: string;
-            type: string;
+        tokenEndpoint: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        tokenType: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        type: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
     }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-        name: {
-            description: string;
-            type: string;
+        readonly name: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        description: {
-            description: string;
-            type: string;
+        readonly description: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        authHeader: {
-            description: string;
-            type: string;
+        readonly authHeader: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        tokenType: {
-            description: string;
-            type: string;
+        readonly tokenType: {
+            type: "string";
+        } & {
             defaultValue: string;
         };
-        domains: {
-            description: string;
-            type: string;
-            defaultValue: never[];
+        readonly domains: {
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
-    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "internetAccountId">>, undefined>>, undefined>>;
+        type: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        internetAccountId: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "internetAccountId", true, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>, undefined, true, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>, undefined, true, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>>;
 }, {
     readonly name: string;
     readonly description: string;
@@ -200,22 +349,21 @@ declare const stateModelFactory: (configSchema: DropboxOAuthInternetAccountConfi
     readonly tokenType: string;
     readonly domains: string[];
     readonly toggleContents: React.ReactNode;
-    readonly SelectorComponent: import("@jbrowse/core/util").AnyReactComponentType | undefined;
     readonly selectorLabel: string | undefined;
+    readonly showInFileSelector: boolean;
 } & {
     handlesLocation(location: UriLocation): boolean;
     readonly tokenKey: string;
 } & {
     getTokenFromUser(_resolve: (token: string) => void, _reject: (error: Error) => void): void;
     storeToken(token: string): void;
-    removeToken(): void;
-    retrieveToken(): string | null;
+    retrieveToken(): string | undefined;
     validateToken(token: string, _loc: UriLocation): Promise<string>;
 } & {
+    removeToken(): void;
     getToken(location?: UriLocation): Promise<string>;
 } & {
     addAuthHeaderToInit(init?: RequestInit, token?: string): {
-        headers: Headers;
         body?: BodyInit | null;
         cache?: RequestCache;
         credentials?: RequestCredentials;
@@ -229,49 +377,75 @@ declare const stateModelFactory: (configSchema: DropboxOAuthInternetAccountConfi
         referrerPolicy?: ReferrerPolicy;
         signal?: AbortSignal | null;
         window?: null;
+        headers: Headers;
     };
+    fetchWithToken(loc: UriLocation | undefined, run: (token: string) => Promise<Response>): Promise<Response>;
     getPreAuthorizationInformation(location: UriLocation): Promise<{
         internetAccountType: string;
         authInfo: {
             token: string;
-            configuration: any;
+            configuration: import("@jbrowse/mobx-state-tree").ModelSnapshotType<Record<string, any>>;
         };
     }>;
 } & {
     getFetcher(loc?: UriLocation): (input: RequestInfo, init?: RequestInit) => Promise<Response>;
 } & {
-    openLocation(location: UriLocation): import("@jbrowse/core/util/io").RemoteFileWithRangeCache;
+    openLocation(location: UriLocation): import("@gmod/range-cache-filehandle").RemoteFileWithRangeCache;
 } & {
-    readonly codeVerifierPKCE: string;
+    readonly conf: import("../OAuthModel/configSchema.ts").OAuthInternetAccountConfig;
 } & {
     readonly authEndpoint: string;
     readonly tokenEndpoint: string;
     readonly needsPKCE: boolean;
     readonly clientId: string;
     readonly scopes: string;
-    state(): string | undefined;
-    readonly responseType: "token" | "code";
+    readonly state: string;
+    readonly responseType: string;
     readonly refreshTokenKey: string;
+    readonly authFlowParams: Record<string, string>;
 } & {
     storeRefreshToken(refreshToken: string): void;
     removeRefreshToken(): void;
-    retrieveRefreshToken(): string | null;
-    exchangeAuthorizationForAccessToken(token: string, redirectUri: string): Promise<string>;
+    retrieveRefreshToken(): string | undefined;
+} & {
+    postTokenGrant(grant: Record<string, string>, describeError: (response: Response) => Promise<string>): Promise<string>;
+} & {
+    exchangeAuthorizationForAccessToken(code: string, redirectUri: string, codeVerifier: string | undefined): Promise<string>;
     exchangeRefreshForAccessToken(refreshToken: string): Promise<string>;
 } & {
-    addMessageChannel(resolve: (token: string) => void, reject: (error: Error) => void): void;
-    deleteMessageChannel(): void;
-    finishOAuthWindow(event: MessageEvent, resolve: (token: string) => void, reject: (error: Error) => void): Promise<void>;
-    useEndpointForAuthorization(resolve: (token: string) => void, reject: (error: Error) => void): Promise<void>;
+    validateTokenWithProbe(token: string, probe: (token: string) => Promise<Response>, describeError: (response: Response, reason?: string) => Promise<string>): Promise<string>;
+    getTokenViaAuthFlow(): Promise<string>;
+} & {
     getTokenFromUser(resolve: (token: string) => void, reject: (error: Error) => void): Promise<void>;
     validateToken(token: string, location: UriLocation): Promise<string>;
 } & {
-    getFetcher(loc?: UriLocation): (input: RequestInfo, init?: RequestInit) => Promise<Response>;
-} & {
-    readonly toggleContents: import("react/jsx-runtime").JSX.Element;
+    /**
+     * #getter
+     * The FileSelector icon for Dropbox
+     */
+    readonly toggleContents: import("react").JSX.Element;
+    /**
+     * #getter
+     */
     readonly selectorLabel: string;
+    /**
+     * #getter
+     * Dropbox issues a refresh token only when the authorization request
+     * asks for offline access, and spells that `token_access_type` where
+     * other providers use `access_type` — so it belongs here rather than on
+     * every OAuth account.
+     */
+    readonly authFlowParams: {
+        token_access_type: string;
+    };
 } & {
+    /**
+     * #method
+     */
     getFetcher(location?: UriLocation): (input: RequestInfo, init?: RequestInit) => Promise<Response>;
+    /**
+     * #action
+     */
     validateToken(token: string, location: UriLocation): Promise<string>;
 }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>;
 export default stateModelFactory;

package/esm/DropboxOAuthModel/model.js

@@ -1,59 +1,84 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ConfigurationReference } from '@jbrowse/core/configuration';
 import { types } from '@jbrowse/mobx-state-tree';
-import DropboxIcon from "./DropboxIcon.js";
-import { getDescriptiveErrorMessage } from "./util.js";
-import { configSchema as OAuthConfigSchema } from "../OAuthModel/index.js";
-import baseModel from "../OAuthModel/model.js";
+import { configSchema as OAuthConfigSchema } from '../OAuthModel/index.js';
+import baseModel from '../OAuthModel/model.js';
+import DropboxIcon from './DropboxIcon.js';
+import { getDescriptiveErrorMessage } from './util.js';
+/**
+ * #stateModel DropboxOAuthInternetAccount
+ */
 const stateModelFactory = (configSchema) => {
     return baseModel(OAuthConfigSchema)
         .named('DropboxOAuthInternetAccount')
         .props({
+        /**
+         * #property
+         */
         type: types.literal('DropboxOAuthInternetAccount'),
+        /**
+         * #property
+         */
         configuration: ConfigurationReference(configSchema),
     })
         .views(() => ({
+        /**
+         * #getter
+         * The FileSelector icon for Dropbox
+         */
         get toggleContents() {
             return _jsx(DropboxIcon, {});
         },
+        /**
+         * #getter
+         */
         get selectorLabel() {
             return 'Enter Dropbox share link';
         },
+        /**
+         * #getter
+         * Dropbox issues a refresh token only when the authorization request
+         * asks for offline access, and spells that `token_access_type` where
+         * other providers use `access_type` — so it belongs here rather than on
+         * every OAuth account.
+         */
+        get authFlowParams() {
+            return { token_access_type: 'offline' };
+        },
     }))
         .actions(self => ({
+        /**
+         * #method
+         */
         getFetcher(location) {
             return async (input, init) => {
-                const authToken = await self.getToken(location);
-                const newInit = self.addAuthHeaderToInit({ ...init, method: 'POST' }, authToken);
-                newInit.headers.append('Dropbox-API-Arg', JSON.stringify({ url: input }));
-                const response = await fetch('https://content.dropboxapi.com/2/sharing/get_shared_link_file', newInit);
+                const response = await self.fetchWithToken(location, authToken => {
+                    // built per attempt: the Headers are appended to below, so a retry
+                    // reusing them would send two Dropbox-API-Arg values
+                    const newInit = self.addAuthHeaderToInit({ ...init, method: 'POST' }, authToken);
+                    newInit.headers.append('Dropbox-API-Arg', JSON.stringify({ url: input }));
+                    return fetch('https://content.dropboxapi.com/2/sharing/get_shared_link_file', newInit);
+                });
                 if (!response.ok) {
                     throw new Error(await getDescriptiveErrorMessage(response));
                 }
                 return response;
             };
         },
+        /**
+         * #action
+         */
         async validateToken(token, location) {
-            const response = await fetch('https://api.dropboxapi.com/2/sharing/get_shared_link_metadata', {
+            return self.validateTokenWithProbe(token, authToken => fetch('https://api.dropboxapi.com/2/sharing/get_shared_link_metadata', {
                 method: 'POST',
                 headers: {
-                    Authorization: `Bearer ${token}`,
+                    Authorization: `Bearer ${authToken}`,
                     'Content-Type': 'application/json',
                 },
                 body: JSON.stringify({
                     url: location.uri,
                 }),
-            });
-            if (!response.ok) {
-                const refreshToken = self.retrieveRefreshToken();
-                if (refreshToken) {
-                    self.removeRefreshToken();
-                    const newToken = await self.exchangeRefreshForAccessToken(refreshToken);
-                    return this.validateToken(newToken, location);
-                }
-                throw new Error(await getDescriptiveErrorMessage(response, 'Token could not be validated'));
-            }
-            return token;
+            }), getDescriptiveErrorMessage);
         },
     }));
 };