@jbrowse/plugin-authentication 2.5.0 → 2.6.1

package/src/HTTPBasicModel/HTTPBasicLoginForm.tsx

@@ -1,12 +1,6 @@
 import React, { useState } from 'react'
-import {
-  Button,
-  Dialog,
-  DialogContent,
-  DialogTitle,
-  DialogActions,
-  TextField,
-} from '@mui/material'
+import { Button, DialogContent, DialogActions, TextField } from '@mui/material'
+import { Dialog } from '@jbrowse/core/ui'
 
 export const HTTPBasicLoginForm = ({
   internetAccountId,
@@ -18,54 +12,57 @@ export const HTTPBasicLoginForm = ({
   const [username, setUsername] = useState('')
   const [password, setPassword] = useState('')
 
-  function onSubmit(event: React.FormEvent<HTMLFormElement>) {
-    if (username && password) {
-      handleClose(btoa(`${username}:${password}`))
-    } else {
-      handleClose()
-    }
-    event.preventDefault()
-  }
-
   return (
-    <>
-      <Dialog open maxWidth="xl" data-testid="login-httpbasic">
-        <DialogTitle>Log In for {internetAccountId}</DialogTitle>
-        <form onSubmit={onSubmit}>
-          <DialogContent style={{ display: 'flex', flexDirection: 'column' }}>
-            <TextField
-              required
-              label="Username"
-              variant="outlined"
-              inputProps={{ 'data-testid': 'login-httpbasic-username' }}
-              onChange={event => setUsername(event.target.value)}
-              margin="dense"
-            />
-            <TextField
-              required
-              label="Password"
-              type="password"
-              autoComplete="current-password"
-              variant="outlined"
-              inputProps={{ 'data-testid': 'login-httpbasic-password' }}
-              onChange={event => setPassword(event.target.value)}
-              margin="dense"
-            />
-          </DialogContent>
-          <DialogActions>
-            <Button variant="contained" color="primary" type="submit">
-              Submit
-            </Button>
-            <Button
-              variant="contained"
-              type="submit"
-              onClick={() => handleClose()}
-            >
-              Cancel
-            </Button>
-          </DialogActions>
-        </form>
-      </Dialog>
-    </>
+    <Dialog
+      open
+      maxWidth="xl"
+      data-testid="login-httpbasic"
+      title={`Log In for ${internetAccountId}`}
+    >
+      <form
+        onSubmit={event => {
+          if (username && password) {
+            handleClose(btoa(`${username}:${password}`))
+          } else {
+            handleClose()
+          }
+          event.preventDefault()
+        }}
+      >
+        <DialogContent style={{ display: 'flex', flexDirection: 'column' }}>
+          <TextField
+            required
+            label="Username"
+            variant="outlined"
+            inputProps={{ 'data-testid': 'login-httpbasic-username' }}
+            onChange={event => setUsername(event.target.value)}
+            margin="dense"
+          />
+          <TextField
+            required
+            label="Password"
+            type="password"
+            autoComplete="current-password"
+            variant="outlined"
+            inputProps={{ 'data-testid': 'login-httpbasic-password' }}
+            onChange={event => setPassword(event.target.value)}
+            margin="dense"
+          />
+        </DialogContent>
+        <DialogActions>
+          <Button variant="contained" color="primary" type="submit">
+            Submit
+          </Button>
+          <Button
+            variant="contained"
+            color="secondary"
+            type="submit"
+            onClick={() => handleClose()}
+          >
+            Cancel
+          </Button>
+        </DialogActions>
+      </form>
+    </Dialog>
   )
 }

package/src/HTTPBasicModel/model.tsx

@@ -1,25 +1,42 @@
 import { ConfigurationReference, getConf } from '@jbrowse/core/configuration'
 import { InternetAccount } from '@jbrowse/core/pluggableElementTypes/models'
 import { UriLocation } from '@jbrowse/core/util/types'
-import { HTTPBasicInternetAccountConfigModel } from './configSchema'
 import { Instance, types, getRoot } from 'mobx-state-tree'
 
+// locals
+import { HTTPBasicInternetAccountConfigModel } from './configSchema'
 import { HTTPBasicLoginForm } from './HTTPBasicLoginForm'
+import { getResponseError } from '../util'
 
+/**
+ * #stateModel HTTPBasicInternetAccount
+ */
 const stateModelFactory = (
   configSchema: HTTPBasicInternetAccountConfigModel,
 ) => {
   return InternetAccount.named('HTTPBasicInternetAccount')
     .props({
+      /**
+       * #property
+       */
       type: types.literal('HTTPBasicInternetAccount'),
+      /**
+       * #property
+       */
       configuration: ConfigurationReference(configSchema),
     })
     .views(self => ({
+      /**
+       * #getter
+       */
       get validateWithHEAD(): boolean {
         return getConf(self, 'validateWithHEAD')
       },
     }))
     .actions(self => ({
+      /**
+       * #action
+       */
       getTokenFromUser(
         resolve: (token: string) => void,
         reject: (error: Error) => void,
@@ -34,13 +51,16 @@ const stateModelFactory = (
               if (token) {
                 resolve(token)
               } else {
-                reject(new Error('user cancelled entry'))
+                reject(new Error('User cancelled entry'))
               }
               doneCallback()
             },
           },
         ])
       },
+      /**
+       * #action
+       */
       async validateToken(token: string, location: UriLocation) {
         if (!self.validateWithHEAD) {
           return token
@@ -48,16 +68,11 @@ const stateModelFactory = (
         const newInit = self.addAuthHeaderToInit({ method: 'HEAD' }, token)
         const response = await fetch(location.uri, newInit)
         if (!response.ok) {
-          let errorMessage
-          try {
-            errorMessage = await response.text()
-          } catch (error) {
-            errorMessage = ''
-          }
           throw new Error(
-            `Error validating token — ${response.status} (${
-              response.statusText
-            })${errorMessage ? ` (${errorMessage})` : ''}`,
+            await getResponseError({
+              response,
+              reason: 'Error validating token',
+            }),
           )
         }
         return token

package/src/OAuthModel/configSchema.ts

@@ -70,18 +70,11 @@ const OAuthConfigSchema = ConfigurationSchema(
      * #slot
      */
     responseType: {
-      description: 'the type of response from the authorization endpoint',
+      description:
+        "the type of response from the authorization endpoint. can be 'token' or 'code'",
       type: 'string',
       defaultValue: 'code',
     },
-    /**
-     * #slot
-     */
-    hasRefreshToken: {
-      description: 'true if the endpoint can supply a refresh token',
-      type: 'boolean',
-      defaultValue: false,
-    },
   },
   {
     /**