@jbrowse/plugin-authentication 2.5.0 → 2.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (96) hide show
  1. package/dist/DropboxOAuthModel/configSchema.d.ts +3 -14
  2. package/dist/DropboxOAuthModel/configSchema.js +0 -8
  3. package/dist/DropboxOAuthModel/configSchema.js.map +1 -1
  4. package/dist/DropboxOAuthModel/model.d.ts +35 -33
  5. package/dist/DropboxOAuthModel/model.js +26 -35
  6. package/dist/DropboxOAuthModel/model.js.map +1 -1
  7. package/dist/DropboxOAuthModel/util.d.ts +1 -0
  8. package/dist/DropboxOAuthModel/util.js +28 -0
  9. package/dist/DropboxOAuthModel/util.js.map +1 -0
  10. package/dist/ExternalTokenModel/ExternalTokenEntryForm.d.ts +2 -1
  11. package/dist/ExternalTokenModel/ExternalTokenEntryForm.js +10 -11
  12. package/dist/ExternalTokenModel/ExternalTokenEntryForm.js.map +1 -1
  13. package/dist/GoogleDriveOAuthModel/GoogleDriveFilehandle.d.ts +15 -0
  14. package/dist/GoogleDriveOAuthModel/GoogleDriveFilehandle.js +20 -0
  15. package/dist/GoogleDriveOAuthModel/GoogleDriveFilehandle.js.map +1 -0
  16. package/dist/GoogleDriveOAuthModel/configSchema.d.ts +0 -5
  17. package/dist/GoogleDriveOAuthModel/model.d.ts +36 -121
  18. package/dist/GoogleDriveOAuthModel/model.js +38 -51
  19. package/dist/GoogleDriveOAuthModel/model.js.map +1 -1
  20. package/dist/GoogleDriveOAuthModel/util.d.ts +1 -0
  21. package/dist/GoogleDriveOAuthModel/util.js +17 -0
  22. package/dist/GoogleDriveOAuthModel/util.js.map +1 -0
  23. package/dist/HTTPBasicModel/HTTPBasicLoginForm.d.ts +2 -1
  24. package/dist/HTTPBasicModel/HTTPBasicLoginForm.js +17 -21
  25. package/dist/HTTPBasicModel/HTTPBasicLoginForm.js.map +1 -1
  26. package/dist/HTTPBasicModel/model.d.ts +36 -4
  27. package/dist/HTTPBasicModel/model.js +24 -9
  28. package/dist/HTTPBasicModel/model.js.map +1 -1
  29. package/dist/OAuthModel/configSchema.d.ts +0 -8
  30. package/dist/OAuthModel/configSchema.js +1 -9
  31. package/dist/OAuthModel/configSchema.js.map +1 -1
  32. package/dist/OAuthModel/model.d.ts +103 -18
  33. package/dist/OAuthModel/model.js +165 -113
  34. package/dist/OAuthModel/model.js.map +1 -1
  35. package/dist/OAuthModel/util.d.ts +7 -0
  36. package/dist/OAuthModel/util.js +60 -0
  37. package/dist/OAuthModel/util.js.map +1 -0
  38. package/dist/index.d.ts +7 -433
  39. package/dist/util.d.ts +6 -0
  40. package/dist/util.js +23 -0
  41. package/dist/util.js.map +1 -0
  42. package/esm/DropboxOAuthModel/configSchema.d.ts +3 -14
  43. package/esm/DropboxOAuthModel/configSchema.js +0 -8
  44. package/esm/DropboxOAuthModel/configSchema.js.map +1 -1
  45. package/esm/DropboxOAuthModel/model.d.ts +35 -33
  46. package/esm/DropboxOAuthModel/model.js +26 -35
  47. package/esm/DropboxOAuthModel/model.js.map +1 -1
  48. package/esm/DropboxOAuthModel/util.d.ts +1 -0
  49. package/esm/DropboxOAuthModel/util.js +24 -0
  50. package/esm/DropboxOAuthModel/util.js.map +1 -0
  51. package/esm/ExternalTokenModel/ExternalTokenEntryForm.d.ts +2 -1
  52. package/esm/ExternalTokenModel/ExternalTokenEntryForm.js +10 -11
  53. package/esm/ExternalTokenModel/ExternalTokenEntryForm.js.map +1 -1
  54. package/esm/GoogleDriveOAuthModel/GoogleDriveFilehandle.d.ts +15 -0
  55. package/esm/GoogleDriveOAuthModel/GoogleDriveFilehandle.js +16 -0
  56. package/esm/GoogleDriveOAuthModel/GoogleDriveFilehandle.js.map +1 -0
  57. package/esm/GoogleDriveOAuthModel/configSchema.d.ts +0 -5
  58. package/esm/GoogleDriveOAuthModel/model.d.ts +36 -121
  59. package/esm/GoogleDriveOAuthModel/model.js +37 -49
  60. package/esm/GoogleDriveOAuthModel/model.js.map +1 -1
  61. package/esm/GoogleDriveOAuthModel/util.d.ts +1 -0
  62. package/esm/GoogleDriveOAuthModel/util.js +13 -0
  63. package/esm/GoogleDriveOAuthModel/util.js.map +1 -0
  64. package/esm/HTTPBasicModel/HTTPBasicLoginForm.d.ts +2 -1
  65. package/esm/HTTPBasicModel/HTTPBasicLoginForm.js +18 -22
  66. package/esm/HTTPBasicModel/HTTPBasicLoginForm.js.map +1 -1
  67. package/esm/HTTPBasicModel/model.d.ts +36 -4
  68. package/esm/HTTPBasicModel/model.js +24 -9
  69. package/esm/HTTPBasicModel/model.js.map +1 -1
  70. package/esm/OAuthModel/configSchema.d.ts +0 -8
  71. package/esm/OAuthModel/configSchema.js +1 -9
  72. package/esm/OAuthModel/configSchema.js.map +1 -1
  73. package/esm/OAuthModel/model.d.ts +103 -18
  74. package/esm/OAuthModel/model.js +164 -86
  75. package/esm/OAuthModel/model.js.map +1 -1
  76. package/esm/OAuthModel/util.d.ts +7 -0
  77. package/esm/OAuthModel/util.js +30 -0
  78. package/esm/OAuthModel/util.js.map +1 -0
  79. package/esm/index.d.ts +7 -433
  80. package/esm/util.d.ts +6 -0
  81. package/esm/util.js +18 -0
  82. package/esm/util.js.map +1 -0
  83. package/package.json +3 -4
  84. package/src/DropboxOAuthModel/configSchema.ts +0 -8
  85. package/src/DropboxOAuthModel/model.tsx +35 -54
  86. package/src/DropboxOAuthModel/util.ts +36 -0
  87. package/src/ExternalTokenModel/ExternalTokenEntryForm.tsx +39 -41
  88. package/src/GoogleDriveOAuthModel/GoogleDriveFilehandle.ts +38 -0
  89. package/src/GoogleDriveOAuthModel/model.tsx +54 -104
  90. package/src/GoogleDriveOAuthModel/util.ts +29 -0
  91. package/src/HTTPBasicModel/HTTPBasicLoginForm.tsx +53 -56
  92. package/src/HTTPBasicModel/model.tsx +26 -11
  93. package/src/OAuthModel/configSchema.ts +2 -9
  94. package/src/OAuthModel/model.tsx +190 -108
  95. package/src/OAuthModel/util.ts +33 -0
  96. package/src/util.ts +25 -0
@@ -1,70 +1,57 @@
1
1
  import React from 'react';
2
2
  import { ConfigurationReference } from '@jbrowse/core/configuration';
3
3
  import { types } from 'mobx-state-tree';
4
- import { RemoteFileWithRangeCache } from '@jbrowse/core/util/io';
5
4
  import { SvgIcon } from '@mui/material';
6
5
  import baseModel from '../OAuthModel/model';
7
6
  import { configSchema as OAuthConfigSchema } from '../OAuthModel';
8
- export class GoogleDriveFile extends RemoteFileWithRangeCache {
9
- constructor(source, opts) {
10
- super(source, opts);
11
- this.statsPromise = this.fetch(source, {
12
- metadataOnly: true,
13
- }).then((response) => response.json());
14
- }
15
- async fetch(input, opts) {
16
- return super.fetch(input, opts);
17
- }
18
- async stat() {
19
- return this.statsPromise;
20
- }
21
- }
7
+ import { getDescriptiveErrorMessage } from './util';
8
+ import { GoogleDriveFile } from './GoogleDriveFilehandle';
22
9
  function GoogleDriveIcon(props) {
23
10
  return (React.createElement(SvgIcon, { ...props },
24
11
  React.createElement("path", { d: "M7.71,3.5L1.15,15L4.58,21L11.13,9.5M9.73,15L6.3,21H19.42L22.85,15M22.28,14L15.42,2H8.58L8.57,2L15.43,14H22.28Z" })));
25
12
  }
26
- async function getDescriptiveErrorMessage(response) {
27
- let errorMessage;
28
- try {
29
- errorMessage = await response.text();
30
- }
31
- catch (error) {
32
- errorMessage = '';
33
- }
34
- if (errorMessage) {
35
- let errorMessageParsed;
36
- try {
37
- errorMessageParsed = JSON.parse(errorMessage);
38
- }
39
- catch (error) {
40
- errorMessageParsed = undefined;
41
- }
42
- if (errorMessageParsed) {
43
- errorMessage = errorMessageParsed.error.message;
44
- }
45
- }
46
- return `Network response failure — ${response.status} (${response.statusText})${errorMessage ? ` (${errorMessage})` : ''}`;
13
+ function getUri(str) {
14
+ const urlId = str.match(/[-\w]{25,}/);
15
+ return `https://www.googleapis.com/drive/v3/files/${urlId}`;
47
16
  }
48
- const stateModelFactory = (configSchema) => {
17
+ /**
18
+ * #stateModel GoogleDriveOAuthInternetAccount
19
+ */
20
+ export default function stateModelFactory(configSchema) {
49
21
  return baseModel(OAuthConfigSchema)
50
22
  .named('GoogleDriveOAuthInternetAccount')
51
23
  .props({
24
+ /**
25
+ * #property
26
+ */
52
27
  type: types.literal('GoogleDriveOAuthInternetAccount'),
28
+ /**
29
+ * #property
30
+ */
53
31
  configuration: ConfigurationReference(configSchema),
54
32
  })
55
33
  .views(() => ({
34
+ /**
35
+ * #getter
36
+ * The FileSelector icon for Google drive
37
+ */
56
38
  get toggleContents() {
57
39
  return React.createElement(GoogleDriveIcon, null);
58
40
  },
41
+ /**
42
+ * #getter
43
+ */
59
44
  get selectorLabel() {
60
45
  return 'Enter Google Drive share link';
61
46
  },
62
47
  }))
63
48
  .actions(self => ({
49
+ /**
50
+ * #method
51
+ */
64
52
  getFetcher(location) {
65
53
  return async (input, init) => {
66
- const urlId = String(input).match(/[-\w]{25,}/);
67
- const driveUrl = new URL(`https://www.googleapis.com/drive/v3/files/${urlId}`);
54
+ const driveUrl = new URL(getUri(String(input)));
68
55
  const searchParams = new URLSearchParams();
69
56
  if (init === null || init === void 0 ? void 0 : init.metadataOnly) {
70
57
  searchParams.append('fields', 'size');
@@ -74,35 +61,36 @@ const stateModelFactory = (configSchema) => {
74
61
  }
75
62
  driveUrl.search = searchParams.toString();
76
63
  const authToken = await self.getToken(location);
77
- const newInit = self.addAuthHeaderToInit({ ...init, method: 'GET', credentials: 'same-origin' }, authToken);
78
- const response = await fetch(driveUrl.toString(), newInit);
64
+ const response = await fetch(driveUrl, self.addAuthHeaderToInit({ ...init, method: 'GET', credentials: 'same-origin' }, authToken));
79
65
  if (!response.ok) {
80
- const message = await getDescriptiveErrorMessage(response);
81
- throw new Error(message);
66
+ throw new Error(await getDescriptiveErrorMessage(response));
82
67
  }
83
68
  return response;
84
69
  };
85
70
  },
71
+ /**
72
+ * #method
73
+ */
86
74
  openLocation(location) {
87
75
  return new GoogleDriveFile(location.uri, {
88
76
  fetch: this.getFetcher(location),
89
77
  });
90
78
  },
79
+ /**
80
+ * #action
81
+ */
91
82
  async validateToken(token, location) {
92
- const urlId = location.uri.match(/[-\w]{25,}/);
93
- const response = await fetch(`https://www.googleapis.com/drive/v3/files/${urlId}`, {
83
+ const response = await fetch(getUri(location.uri), {
94
84
  headers: {
95
85
  Authorization: `Bearer ${token}`,
96
86
  'Content-Type': 'application/x-www-form-urlencoded',
97
87
  },
98
88
  });
99
89
  if (!response.ok) {
100
- const message = await getDescriptiveErrorMessage(response);
101
- throw new Error(`Token could not be validated. ${message}`);
90
+ throw new Error(await getDescriptiveErrorMessage(response, 'Token could not be validated'));
102
91
  }
103
92
  return token;
104
93
  },
105
94
  }));
106
- };
107
- export default stateModelFactory;
95
+ }
108
96
  //# sourceMappingURL=model.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/GoogleDriveOAuthModel/model.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/GoogleDriveOAuthModel/model.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export declare function getDescriptiveErrorMessage(response: Response, reason?: string): Promise<string>;
@@ -0,0 +1,13 @@
1
+ import { getResponseError } from '../util';
2
+ export async function getDescriptiveErrorMessage(response, reason) {
3
+ let errorMessage = '';
4
+ try {
5
+ const err = JSON.parse(await response.text());
6
+ errorMessage = err.error.message;
7
+ }
8
+ catch (error) {
9
+ /* do nothing */
10
+ }
11
+ return getResponseError({ response, reason, statusText: errorMessage });
12
+ }
13
+ //# sourceMappingURL=util.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/GoogleDriveOAuthModel/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAgB1C,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,QAAkB,EAClB,MAAe;IAEf,IAAI,YAAY,GAAG,EAAE,CAAA;IACrB,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAqB,CAAA;QACjE,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAA;KACjC;IAAC,OAAO,KAAK,EAAE;QACd,gBAAgB;KACjB;IACD,OAAO,gBAAgB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAA;AACzE,CAAC"}
@@ -1,4 +1,5 @@
1
+ import React from 'react';
1
2
  export declare const HTTPBasicLoginForm: ({ internetAccountId, handleClose, }: {
2
3
  internetAccountId: string;
3
4
  handleClose: (arg?: string) => void;
4
- }) => JSX.Element;
5
+ }) => React.JSX.Element;
@@ -1,28 +1,24 @@
1
1
  import React, { useState } from 'react';
2
- import { Button, Dialog, DialogContent, DialogTitle, DialogActions, TextField, } from '@mui/material';
2
+ import { Button, DialogContent, DialogActions, TextField } from '@mui/material';
3
+ import { Dialog } from '@jbrowse/core/ui';
3
4
  export const HTTPBasicLoginForm = ({ internetAccountId, handleClose, }) => {
4
5
  const [username, setUsername] = useState('');
5
6
  const [password, setPassword] = useState('');
6
- function onSubmit(event) {
7
- if (username && password) {
8
- handleClose(btoa(`${username}:${password}`));
9
- }
10
- else {
11
- handleClose();
12
- }
13
- event.preventDefault();
14
- }
15
- return (React.createElement(React.Fragment, null,
16
- React.createElement(Dialog, { open: true, maxWidth: "xl", "data-testid": "login-httpbasic" },
17
- React.createElement(DialogTitle, null,
18
- "Log In for ",
19
- internetAccountId),
20
- React.createElement("form", { onSubmit: onSubmit },
21
- React.createElement(DialogContent, { style: { display: 'flex', flexDirection: 'column' } },
22
- React.createElement(TextField, { required: true, label: "Username", variant: "outlined", inputProps: { 'data-testid': 'login-httpbasic-username' }, onChange: event => setUsername(event.target.value), margin: "dense" }),
23
- React.createElement(TextField, { required: true, label: "Password", type: "password", autoComplete: "current-password", variant: "outlined", inputProps: { 'data-testid': 'login-httpbasic-password' }, onChange: event => setPassword(event.target.value), margin: "dense" })),
24
- React.createElement(DialogActions, null,
25
- React.createElement(Button, { variant: "contained", color: "primary", type: "submit" }, "Submit"),
26
- React.createElement(Button, { variant: "contained", type: "submit", onClick: () => handleClose() }, "Cancel"))))));
7
+ return (React.createElement(Dialog, { open: true, maxWidth: "xl", "data-testid": "login-httpbasic", title: `Log In for ${internetAccountId}` },
8
+ React.createElement("form", { onSubmit: event => {
9
+ if (username && password) {
10
+ handleClose(btoa(`${username}:${password}`));
11
+ }
12
+ else {
13
+ handleClose();
14
+ }
15
+ event.preventDefault();
16
+ } },
17
+ React.createElement(DialogContent, { style: { display: 'flex', flexDirection: 'column' } },
18
+ React.createElement(TextField, { required: true, label: "Username", variant: "outlined", inputProps: { 'data-testid': 'login-httpbasic-username' }, onChange: event => setUsername(event.target.value), margin: "dense" }),
19
+ React.createElement(TextField, { required: true, label: "Password", type: "password", autoComplete: "current-password", variant: "outlined", inputProps: { 'data-testid': 'login-httpbasic-password' }, onChange: event => setPassword(event.target.value), margin: "dense" })),
20
+ React.createElement(DialogActions, null,
21
+ React.createElement(Button, { variant: "contained", color: "primary", type: "submit" }, "Submit"),
22
+ React.createElement(Button, { variant: "contained", color: "secondary", type: "submit", onClick: () => handleClose() }, "Cancel")))));
27
23
  };
28
24
  //# sourceMappingURL=HTTPBasicLoginForm.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"HTTPBasicLoginForm.js","sourceRoot":"","sources":["../../src/HTTPBasicModel/HTTPBasicLoginForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,EACL,MAAM,EACN,MAAM,EACN,aAAa,EACb,WAAW,EACX,aAAa,EACb,SAAS,GACV,MAAM,eAAe,CAAA;AAEtB,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,iBAAiB,EACjB,WAAW,GAIZ,EAAE,EAAE;IACH,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;IAC5C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;IAE5C,SAAS,QAAQ,CAAC,KAAuC;QACvD,IAAI,QAAQ,IAAI,QAAQ,EAAE;YACxB,WAAW,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAA;SAC7C;aAAM;YACL,WAAW,EAAE,CAAA;SACd;QACD,KAAK,CAAC,cAAc,EAAE,CAAA;IACxB,CAAC;IAED,OAAO,CACL;QACE,oBAAC,MAAM,IAAC,IAAI,QAAC,QAAQ,EAAC,IAAI,iBAAa,iBAAiB;YACtD,oBAAC,WAAW;;gBAAa,iBAAiB,CAAe;YACzD,8BAAM,QAAQ,EAAE,QAAQ;gBACtB,oBAAC,aAAa,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE;oBAChE,oBAAC,SAAS,IACR,QAAQ,QACR,KAAK,EAAC,UAAU,EAChB,OAAO,EAAC,UAAU,EAClB,UAAU,EAAE,EAAE,aAAa,EAAE,0BAA0B,EAAE,EACzD,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAClD,MAAM,EAAC,OAAO,GACd;oBACF,oBAAC,SAAS,IACR,QAAQ,QACR,KAAK,EAAC,UAAU,EAChB,IAAI,EAAC,UAAU,EACf,YAAY,EAAC,kBAAkB,EAC/B,OAAO,EAAC,UAAU,EAClB,UAAU,EAAE,EAAE,aAAa,EAAE,0BAA0B,EAAE,EACzD,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAClD,MAAM,EAAC,OAAO,GACd,CACY;gBAChB,oBAAC,aAAa;oBACZ,oBAAC,MAAM,IAAC,OAAO,EAAC,WAAW,EAAC,KAAK,EAAC,SAAS,EAAC,IAAI,EAAC,QAAQ,aAEhD;oBACT,oBAAC,MAAM,IACL,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,QAAQ,EACb,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,aAGrB,CACK,CACX,CACA,CACR,CACJ,CAAA;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"HTTPBasicLoginForm.js","sourceRoot":"","sources":["../../src/HTTPBasicModel/HTTPBasicLoginForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC/E,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,iBAAiB,EACjB,WAAW,GAIZ,EAAE,EAAE;IACH,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;IAC5C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;IAE5C,OAAO,CACL,oBAAC,MAAM,IACL,IAAI,QACJ,QAAQ,EAAC,IAAI,iBACD,iBAAiB,EAC7B,KAAK,EAAE,cAAc,iBAAiB,EAAE;QAExC,8BACE,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAChB,IAAI,QAAQ,IAAI,QAAQ,EAAE;oBACxB,WAAW,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAA;iBAC7C;qBAAM;oBACL,WAAW,EAAE,CAAA;iBACd;gBACD,KAAK,CAAC,cAAc,EAAE,CAAA;YACxB,CAAC;YAED,oBAAC,aAAa,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE;gBAChE,oBAAC,SAAS,IACR,QAAQ,QACR,KAAK,EAAC,UAAU,EAChB,OAAO,EAAC,UAAU,EAClB,UAAU,EAAE,EAAE,aAAa,EAAE,0BAA0B,EAAE,EACzD,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAClD,MAAM,EAAC,OAAO,GACd;gBACF,oBAAC,SAAS,IACR,QAAQ,QACR,KAAK,EAAC,UAAU,EAChB,IAAI,EAAC,UAAU,EACf,YAAY,EAAC,kBAAkB,EAC/B,OAAO,EAAC,UAAU,EAClB,UAAU,EAAE,EAAE,aAAa,EAAE,0BAA0B,EAAE,EACzD,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAClD,MAAM,EAAC,OAAO,GACd,CACY;YAChB,oBAAC,aAAa;gBACZ,oBAAC,MAAM,IAAC,OAAO,EAAC,WAAW,EAAC,KAAK,EAAC,SAAS,EAAC,IAAI,EAAC,QAAQ,aAEhD;gBACT,oBAAC,MAAM,IACL,OAAO,EAAC,WAAW,EACnB,KAAK,EAAC,WAAW,EACjB,IAAI,EAAC,QAAQ,EACb,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,aAGrB,CACK,CACX,CACA,CACV,CAAA;AACH,CAAC,CAAA"}
@@ -1,6 +1,9 @@
1
1
  /// <reference types="react" />
2
2
  import { UriLocation } from '@jbrowse/core/util/types';
3
3
  import { Instance } from 'mobx-state-tree';
4
+ /**
5
+ * #stateModel HTTPBasicInternetAccount
6
+ */
4
7
  declare const stateModelFactory: (configSchema: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
5
8
  tokenType: {
6
9
  description: string;
@@ -10,7 +13,9 @@ declare const stateModelFactory: (configSchema: import("@jbrowse/core/configurat
10
13
  validateWithHEAD: {
11
14
  description: string;
12
15
  type: string;
13
- defaultValue: boolean;
16
+ defaultValue: boolean; /**
17
+ * #property
18
+ */
14
19
  };
15
20
  }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
16
21
  name: {
@@ -36,6 +41,9 @@ declare const stateModelFactory: (configSchema: import("@jbrowse/core/configurat
36
41
  domains: {
37
42
  description: string;
38
43
  type: string;
44
+ /**
45
+ * #property
46
+ */
39
47
  defaultValue: never[];
40
48
  };
41
49
  }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "internetAccountId">>, undefined>>) => import("mobx-state-tree").IModelType<{
@@ -46,12 +54,16 @@ declare const stateModelFactory: (configSchema: import("@jbrowse/core/configurat
46
54
  description: string;
47
55
  type: string;
48
56
  defaultValue: string;
49
- };
57
+ }; /**
58
+ * #property
59
+ */
50
60
  description: {
51
61
  description: string;
52
62
  type: string;
53
63
  defaultValue: string;
54
- };
64
+ }; /**
65
+ * #getter
66
+ */
55
67
  authHeader: {
56
68
  description: string;
57
69
  type: string;
@@ -69,7 +81,13 @@ declare const stateModelFactory: (configSchema: import("@jbrowse/core/configurat
69
81
  };
70
82
  }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "internetAccountId">>;
71
83
  } & {
84
+ /**
85
+ * #property
86
+ */
72
87
  type: import("mobx-state-tree").ISimpleType<"HTTPBasicInternetAccount">;
88
+ /**
89
+ * #property
90
+ */
73
91
  configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
74
92
  tokenType: {
75
93
  description: string;
@@ -79,7 +97,9 @@ declare const stateModelFactory: (configSchema: import("@jbrowse/core/configurat
79
97
  validateWithHEAD: {
80
98
  description: string;
81
99
  type: string;
82
- defaultValue: boolean;
100
+ defaultValue: boolean; /**
101
+ * #property
102
+ */
83
103
  };
84
104
  }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
85
105
  name: {
@@ -105,6 +125,9 @@ declare const stateModelFactory: (configSchema: import("@jbrowse/core/configurat
105
125
  domains: {
106
126
  description: string;
107
127
  type: string;
128
+ /**
129
+ * #property
130
+ */
108
131
  defaultValue: never[];
109
132
  };
110
133
  }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "internetAccountId">>, undefined>>;
@@ -157,9 +180,18 @@ declare const stateModelFactory: (configSchema: import("@jbrowse/core/configurat
157
180
  } & {
158
181
  openLocation(location: UriLocation): import("@jbrowse/core/util/io").RemoteFileWithRangeCache;
159
182
  } & {
183
+ /**
184
+ * #getter
185
+ */
160
186
  readonly validateWithHEAD: boolean;
161
187
  } & {
188
+ /**
189
+ * #action
190
+ */
162
191
  getTokenFromUser(resolve: (token: string) => void, reject: (error: Error) => void): void;
192
+ /**
193
+ * #action
194
+ */
163
195
  validateToken(token: string, location: UriLocation): Promise<string>;
164
196
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
165
197
  export default stateModelFactory;
@@ -2,18 +2,34 @@ import { ConfigurationReference, getConf } from '@jbrowse/core/configuration';
2
2
  import { InternetAccount } from '@jbrowse/core/pluggableElementTypes/models';
3
3
  import { types, getRoot } from 'mobx-state-tree';
4
4
  import { HTTPBasicLoginForm } from './HTTPBasicLoginForm';
5
+ import { getResponseError } from '../util';
6
+ /**
7
+ * #stateModel HTTPBasicInternetAccount
8
+ */
5
9
  const stateModelFactory = (configSchema) => {
6
10
  return InternetAccount.named('HTTPBasicInternetAccount')
7
11
  .props({
12
+ /**
13
+ * #property
14
+ */
8
15
  type: types.literal('HTTPBasicInternetAccount'),
16
+ /**
17
+ * #property
18
+ */
9
19
  configuration: ConfigurationReference(configSchema),
10
20
  })
11
21
  .views(self => ({
22
+ /**
23
+ * #getter
24
+ */
12
25
  get validateWithHEAD() {
13
26
  return getConf(self, 'validateWithHEAD');
14
27
  },
15
28
  }))
16
29
  .actions(self => ({
30
+ /**
31
+ * #action
32
+ */
17
33
  getTokenFromUser(resolve, reject) {
18
34
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
19
35
  const { session } = getRoot(self);
@@ -26,13 +42,16 @@ const stateModelFactory = (configSchema) => {
26
42
  resolve(token);
27
43
  }
28
44
  else {
29
- reject(new Error('user cancelled entry'));
45
+ reject(new Error('User cancelled entry'));
30
46
  }
31
47
  doneCallback();
32
48
  },
33
49
  },
34
50
  ]);
35
51
  },
52
+ /**
53
+ * #action
54
+ */
36
55
  async validateToken(token, location) {
37
56
  if (!self.validateWithHEAD) {
38
57
  return token;
@@ -40,14 +59,10 @@ const stateModelFactory = (configSchema) => {
40
59
  const newInit = self.addAuthHeaderToInit({ method: 'HEAD' }, token);
41
60
  const response = await fetch(location.uri, newInit);
42
61
  if (!response.ok) {
43
- let errorMessage;
44
- try {
45
- errorMessage = await response.text();
46
- }
47
- catch (error) {
48
- errorMessage = '';
49
- }
50
- throw new Error(`Error validating token — ${response.status} (${response.statusText})${errorMessage ? ` (${errorMessage})` : ''}`);
62
+ throw new Error(await getResponseError({
63
+ response,
64
+ reason: 'Error validating token',
65
+ }));
51
66
  }
52
67
  return token;
53
68
  },
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/HTTPBasicModel/model.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAA;AAG5E,OAAO,EAAY,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,iBAAiB,GAAG,CACxB,YAAiD,EACjD,EAAE;IACF,OAAO,eAAe,CAAC,KAAK,CAAC,0BAA0B,CAAC;SACrD,KAAK,CAAC;QACL,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,0BAA0B,CAAC;QAC/C,aAAa,EAAE,sBAAsB,CAAC,YAAY,CAAC;KACpD,CAAC;SACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACd,IAAI,gBAAgB;YAClB,OAAO,OAAO,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAA;QAC1C,CAAC;KACF,CAAC,CAAC;SACF,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChB,gBAAgB,CACd,OAAgC,EAChC,MAA8B;YAE9B,8DAA8D;YAC9D,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAM,IAAI,CAAC,CAAA;YACtC,OAAO,CAAC,WAAW,CAAC,CAAC,YAAwB,EAAE,EAAE,CAAC;gBAChD,kBAAkB;gBAClB;oBACE,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;oBACzC,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE;wBAC7B,IAAI,KAAK,EAAE;4BACT,OAAO,CAAC,KAAK,CAAC,CAAA;yBACf;6BAAM;4BACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAA;yBAC1C;wBACD,YAAY,EAAE,CAAA;oBAChB,CAAC;iBACF;aACF,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,QAAqB;YACtD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAC1B,OAAO,KAAK,CAAA;aACb;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,CAAA;YACnE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YACnD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;gBAChB,IAAI,YAAY,CAAA;gBAChB,IAAI;oBACF,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;iBACrC;gBAAC,OAAO,KAAK,EAAE;oBACd,YAAY,GAAG,EAAE,CAAA;iBAClB;gBACD,MAAM,IAAI,KAAK,CACb,4BAA4B,QAAQ,CAAC,MAAM,KACzC,QAAQ,CAAC,UACX,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/C,CAAA;aACF;YACD,OAAO,KAAK,CAAA;QACd,CAAC;KACF,CAAC,CAAC,CAAA;AACP,CAAC,CAAA;AAED,eAAe,iBAAiB,CAAA"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/HTTPBasicModel/model.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAA;AAE5E,OAAO,EAAY,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAI1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE1C;;GAEG;AACH,MAAM,iBAAiB,GAAG,CACxB,YAAiD,EACjD,EAAE;IACF,OAAO,eAAe,CAAC,KAAK,CAAC,0BAA0B,CAAC;SACrD,KAAK,CAAC;QACL;;WAEG;QACH,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,0BAA0B,CAAC;QAC/C;;WAEG;QACH,aAAa,EAAE,sBAAsB,CAAC,YAAY,CAAC;KACpD,CAAC;SACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACd;;WAEG;QACH,IAAI,gBAAgB;YAClB,OAAO,OAAO,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAA;QAC1C,CAAC;KACF,CAAC,CAAC;SACF,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChB;;WAEG;QACH,gBAAgB,CACd,OAAgC,EAChC,MAA8B;YAE9B,8DAA8D;YAC9D,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAM,IAAI,CAAC,CAAA;YACtC,OAAO,CAAC,WAAW,CAAC,CAAC,YAAwB,EAAE,EAAE,CAAC;gBAChD,kBAAkB;gBAClB;oBACE,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;oBACzC,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE;wBAC7B,IAAI,KAAK,EAAE;4BACT,OAAO,CAAC,KAAK,CAAC,CAAA;yBACf;6BAAM;4BACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAA;yBAC1C;wBACD,YAAY,EAAE,CAAA;oBAChB,CAAC;iBACF;aACF,CAAC,CAAA;QACJ,CAAC;QACD;;WAEG;QACH,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,QAAqB;YACtD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAC1B,OAAO,KAAK,CAAA;aACb;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,CAAA;YACnE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YACnD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;gBAChB,MAAM,IAAI,KAAK,CACb,MAAM,gBAAgB,CAAC;oBACrB,QAAQ;oBACR,MAAM,EAAE,wBAAwB;iBACjC,CAAC,CACH,CAAA;aACF;YACD,OAAO,KAAK,CAAA;QACd,CAAC;KACF,CAAC,CAAC,CAAA;AACP,CAAC,CAAA;AAED,eAAe,iBAAiB,CAAA"}
@@ -64,14 +64,6 @@ declare const OAuthConfigSchema: import("@jbrowse/core/configuration/configurati
64
64
  type: string;
65
65
  defaultValue: string;
66
66
  };
67
- /**
68
- * #slot
69
- */
70
- hasRefreshToken: {
71
- description: string;
72
- type: string;
73
- defaultValue: boolean;
74
- };
75
67
  }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
76
68
  name: {
77
69
  description: string;
@@ -65,18 +65,10 @@ const OAuthConfigSchema = ConfigurationSchema('OAuthInternetAccount', {
65
65
  * #slot
66
66
  */
67
67
  responseType: {
68
- description: 'the type of response from the authorization endpoint',
68
+ description: "the type of response from the authorization endpoint. can be 'token' or 'code'",
69
69
  type: 'string',
70
70
  defaultValue: 'code',
71
71
  },
72
- /**
73
- * #slot
74
- */
75
- hasRefreshToken: {
76
- description: 'true if the endpoint can supply a refresh token',
77
- type: 'boolean',
78
- defaultValue: false,
79
- },
80
72
  }, {
81
73
  /**
82
74
  * #baseConfiguration
@@ -1 +1 @@
1
- {"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../src/OAuthModel/configSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAEjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAA;AAEtF;;GAEG;AACH,SAAS,CAAC,KAAI,CAAC,CAAC,wDAAwD;AAExE,MAAM,iBAAiB,GAAG,mBAAmB,CAC3C,sBAAsB,EACtB;IACE;;OAEG;IACH,SAAS,EAAE;QACT,WAAW,EAAE,oDAAoD;QACjE,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,QAAQ;KACvB;IACD;;OAEG;IACH,YAAY,EAAE;QACZ,WAAW,EAAE,yDAAyD;QACtE,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,aAAa,EAAE;QACb,WAAW,EAAE,4CAA4C;QACzD,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,SAAS,EAAE;QACT,WAAW,EAAE,uDAAuD;QACpE,IAAI,EAAE,SAAS;QACf,YAAY,EAAE,KAAK;KACpB;IACD;;OAEG;IACH,QAAQ,EAAE;QACR,WAAW,EAAE,8BAA8B;QAC3C,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,MAAM,EAAE;QACN,WAAW,EAAE,4CAA4C;QACzD,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,KAAK,EAAE;QACL,WAAW,EAAE,2CAA2C;QACxD,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,YAAY,EAAE;QACZ,WAAW,EAAE,sDAAsD;QACnE,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,MAAM;KACrB;IACD;;OAEG;IACH,eAAe,EAAE;QACf,WAAW,EAAE,iDAAiD;QAC9D,IAAI,EAAE,SAAS;QACf,YAAY,EAAE,KAAK;KACpB;CACF,EACD;IACE;;OAEG;IACH,iBAAiB,EAAE,yBAAyB;IAC5C,eAAe,EAAE,IAAI;CACtB,CACF,CAAA;AAKD,eAAe,iBAAiB,CAAA"}
1
+ {"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../src/OAuthModel/configSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAEjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAA;AAEtF;;GAEG;AACH,SAAS,CAAC,KAAI,CAAC,CAAC,wDAAwD;AAExE,MAAM,iBAAiB,GAAG,mBAAmB,CAC3C,sBAAsB,EACtB;IACE;;OAEG;IACH,SAAS,EAAE;QACT,WAAW,EAAE,oDAAoD;QACjE,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,QAAQ;KACvB;IACD;;OAEG;IACH,YAAY,EAAE;QACZ,WAAW,EAAE,yDAAyD;QACtE,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,aAAa,EAAE;QACb,WAAW,EAAE,4CAA4C;QACzD,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,SAAS,EAAE;QACT,WAAW,EAAE,uDAAuD;QACpE,IAAI,EAAE,SAAS;QACf,YAAY,EAAE,KAAK;KACpB;IACD;;OAEG;IACH,QAAQ,EAAE;QACR,WAAW,EAAE,8BAA8B;QAC3C,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,MAAM,EAAE;QACN,WAAW,EAAE,4CAA4C;QACzD,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,KAAK,EAAE;QACL,WAAW,EAAE,2CAA2C;QACxD,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,YAAY,EAAE;QACZ,WAAW,EACT,gFAAgF;QAClF,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,MAAM;KACrB;CACF,EACD;IACE;;OAEG;IACH,iBAAiB,EAAE,yBAAyB;IAC5C,eAAe,EAAE,IAAI;CACtB,CACF,CAAA;AAKD,eAAe,iBAAiB,CAAA"}