@deephaven/app-utils 0.33.1-auth-plugins.25 → 0.37.0

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.
@@ -1 +1 @@
1
- {"version":3,"file":"AuthBootstrap.d.ts","sourceRoot":"","sources":["../../src/components/AuthBootstrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAYf,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AASF;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,kBAAkB,eA2E7D;AAED,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"AuthBootstrap.d.ts","sourceRoot":"","sources":["../../src/components/AuthBootstrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAYf,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AASF;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,kBAAkB,eA4E7D;AAED,eAAe,aAAa,CAAC"}
@@ -17,6 +17,8 @@ export function AuthBootstrap(_ref) {
17
17
  children
18
18
  } = _ref;
19
19
  var client = useClient();
20
+ // `useContext` instead of `usePlugins` so that we don't have to wait for the plugins to load
21
+ // We want to load the auth config values in parallel with the plugins
20
22
  var plugins = useContext(PluginsContext);
21
23
  var [authConfig, setAuthConfig] = useState();
22
24
  var [isLoggedIn, setIsLoggedIn] = useState(false);
@@ -50,8 +52,12 @@ export function AuthBootstrap(_ref) {
50
52
  if (plugins == null || authConfig == null) {
51
53
  return undefined;
52
54
  }
53
- return getAuthPluginComponent(client, plugins, authConfig, CORE_AUTH_PLUGINS);
54
- }, [authConfig, client, plugins]);
55
+ try {
56
+ return getAuthPluginComponent(plugins, authConfig, CORE_AUTH_PLUGINS);
57
+ } catch (e) {
58
+ setError(e);
59
+ }
60
+ }, [authConfig, plugins]);
55
61
  var handleLoginSuccess = useCallback(() => {
56
62
  setIsLoggedIn(true);
57
63
  }, []);
@@ -1 +1 @@
1
- {"version":3,"file":"AuthBootstrap.js","names":["React","useCallback","useContext","useEffect","useMemo","useState","AuthPluginAnonymous","AuthPluginParent","AuthPluginPsk","LoadingOverlay","PluginsContext","getAuthPluginComponent","useClient","CORE_AUTH_PLUGINS","Map","AuthBootstrap","children","client","plugins","authConfig","setAuthConfig","isLoggedIn","setIsLoggedIn","error","setError","initAuthConfigValues","isCancelled","loadAuthConfigValues","newAuthConfigValues","getAuthConfigValues","e","AuthComponent","undefined","handleLoginSuccess","handleLoginFailure","isLoading"],"sources":["../../src/components/AuthBootstrap.tsx"],"sourcesContent":["import React, {\n useCallback,\n useContext,\n useEffect,\n useMemo,\n useState,\n} from 'react';\nimport {\n AuthConfigMap,\n AuthPluginAnonymous,\n AuthPluginParent,\n AuthPluginPsk,\n} from '@deephaven/auth-plugins';\nimport { LoadingOverlay } from '@deephaven/components';\nimport { PluginsContext } from './PluginsBootstrap';\nimport { getAuthPluginComponent } from '../plugins';\nimport useClient from './useClient';\n\nexport type AuthBootstrapProps = {\n /**\n * The children to render after authentication is completed.\n */\n children: React.ReactNode;\n};\n\n/** Core auth plugins that are always loaded */\nconst CORE_AUTH_PLUGINS = new Map([\n ['@deephaven/auth-plugins.AuthPluginPsk', AuthPluginPsk],\n ['@deephaven/auth-plugins.AuthPluginParent', AuthPluginParent],\n ['@deephaven/auth-plugins.AuthPluginAnonymous', AuthPluginAnonymous],\n]);\n\n/**\n * AuthBootstrap component. Handles displaying the auth plugin and authenticating.\n */\nexport function AuthBootstrap({ children }: AuthBootstrapProps) {\n const client = useClient();\n const plugins = useContext(PluginsContext);\n const [authConfig, setAuthConfig] = useState<AuthConfigMap>();\n const [isLoggedIn, setIsLoggedIn] = useState(false);\n const [error, setError] = useState<unknown>();\n\n useEffect(\n function initAuthConfigValues() {\n let isCancelled = false;\n async function loadAuthConfigValues() {\n try {\n const newAuthConfigValues = await client.getAuthConfigValues();\n if (!isCancelled) {\n setAuthConfig(new Map(newAuthConfigValues));\n }\n } catch (e) {\n if (!isCancelled) {\n setError(e);\n }\n }\n }\n loadAuthConfigValues();\n return () => {\n isCancelled = true;\n };\n },\n [client]\n );\n\n const AuthComponent = useMemo(() => {\n if (plugins == null || authConfig == null) {\n return undefined;\n }\n\n return getAuthPluginComponent(\n client,\n plugins,\n authConfig,\n CORE_AUTH_PLUGINS\n );\n }, [authConfig, client, plugins]);\n\n const handleLoginSuccess = useCallback(() => {\n setIsLoggedIn(true);\n }, []);\n\n const handleLoginFailure = useCallback((e: unknown) => {\n setIsLoggedIn(false);\n setError(e);\n }, []);\n\n const isLoading = AuthComponent == null || authConfig == null;\n\n if (isLoading || error != null) {\n return (\n <LoadingOverlay\n isLoading={isLoading}\n errorMessage={error != null ? `${error}` : undefined}\n />\n );\n }\n if (!isLoggedIn) {\n return (\n <AuthComponent\n authConfigValues={authConfig}\n client={client}\n onSuccess={handleLoginSuccess}\n onFailure={handleLoginFailure}\n />\n );\n }\n\n // eslint-disable-next-line react/jsx-no-useless-fragment\n return <>{children}</>;\n}\n\nexport default AuthBootstrap;\n"],"mappings":"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"}
1
+ {"version":3,"file":"AuthBootstrap.js","names":["React","useCallback","useContext","useEffect","useMemo","useState","AuthPluginAnonymous","AuthPluginParent","AuthPluginPsk","LoadingOverlay","PluginsContext","getAuthPluginComponent","useClient","CORE_AUTH_PLUGINS","Map","AuthBootstrap","children","client","plugins","authConfig","setAuthConfig","isLoggedIn","setIsLoggedIn","error","setError","initAuthConfigValues","isCancelled","loadAuthConfigValues","newAuthConfigValues","getAuthConfigValues","e","AuthComponent","undefined","handleLoginSuccess","handleLoginFailure","isLoading"],"sources":["../../src/components/AuthBootstrap.tsx"],"sourcesContent":["import React, {\n useCallback,\n useContext,\n useEffect,\n useMemo,\n useState,\n} from 'react';\nimport {\n AuthConfigMap,\n AuthPluginAnonymous,\n AuthPluginParent,\n AuthPluginPsk,\n} from '@deephaven/auth-plugins';\nimport { LoadingOverlay } from '@deephaven/components';\nimport { PluginsContext } from './PluginsBootstrap';\nimport { getAuthPluginComponent } from '../plugins';\nimport useClient from './useClient';\n\nexport type AuthBootstrapProps = {\n /**\n * The children to render after authentication is completed.\n */\n children: React.ReactNode;\n};\n\n/** Core auth plugins that are always loaded */\nconst CORE_AUTH_PLUGINS = new Map([\n ['@deephaven/auth-plugins.AuthPluginPsk', AuthPluginPsk],\n ['@deephaven/auth-plugins.AuthPluginParent', AuthPluginParent],\n ['@deephaven/auth-plugins.AuthPluginAnonymous', AuthPluginAnonymous],\n]);\n\n/**\n * AuthBootstrap component. Handles displaying the auth plugin and authenticating.\n */\nexport function AuthBootstrap({ children }: AuthBootstrapProps) {\n const client = useClient();\n // `useContext` instead of `usePlugins` so that we don't have to wait for the plugins to load\n // We want to load the auth config values in parallel with the plugins\n const plugins = useContext(PluginsContext);\n const [authConfig, setAuthConfig] = useState<AuthConfigMap>();\n const [isLoggedIn, setIsLoggedIn] = useState(false);\n const [error, setError] = useState<unknown>();\n\n useEffect(\n function initAuthConfigValues() {\n let isCancelled = false;\n async function loadAuthConfigValues() {\n try {\n const newAuthConfigValues = await client.getAuthConfigValues();\n if (!isCancelled) {\n setAuthConfig(new Map(newAuthConfigValues));\n }\n } catch (e) {\n if (!isCancelled) {\n setError(e);\n }\n }\n }\n loadAuthConfigValues();\n return () => {\n isCancelled = true;\n };\n },\n [client]\n );\n\n const AuthComponent = useMemo(() => {\n if (plugins == null || authConfig == null) {\n return undefined;\n }\n\n try {\n return getAuthPluginComponent(plugins, authConfig, CORE_AUTH_PLUGINS);\n } catch (e) {\n setError(e);\n }\n }, [authConfig, plugins]);\n\n const handleLoginSuccess = useCallback(() => {\n setIsLoggedIn(true);\n }, []);\n\n const handleLoginFailure = useCallback((e: unknown) => {\n setIsLoggedIn(false);\n setError(e);\n }, []);\n\n const isLoading = AuthComponent == null || authConfig == null;\n\n if (isLoading || error != null) {\n return (\n <LoadingOverlay\n isLoading={isLoading}\n errorMessage={error != null ? `${error}` : undefined}\n />\n );\n }\n if (!isLoggedIn) {\n return (\n <AuthComponent\n authConfigValues={authConfig}\n client={client}\n onSuccess={handleLoginSuccess}\n onFailure={handleLoginFailure}\n />\n );\n }\n\n // eslint-disable-next-line react/jsx-no-useless-fragment\n return <>{children}</>;\n}\n\nexport default AuthBootstrap;\n"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ConnectionBootstrap.d.ts","sourceRoot":"","sources":["../../src/components/ConnectionBootstrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAMvD,eAAO,MAAM,iBAAiB,qCAA4C,CAAC;AAE3E,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;OAGG;IACH,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,EAAE,QAAQ,EAAE,EAAE,wBAAwB,eA+DzE;AAED,eAAe,mBAAmB,CAAC"}
1
+ {"version":3,"file":"ConnectionBootstrap.d.ts","sourceRoot":"","sources":["../../src/components/ConnectionBootstrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAMvD,eAAO,MAAM,iBAAiB,qCAA4C,CAAC;AAE3E,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;OAGG;IACH,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,EAAE,QAAQ,EAAE,EAAE,wBAAwB,eAgEzE;AAED,eAAe,mBAAmB,CAAC"}
@@ -59,6 +59,7 @@ export function ConnectionBootstrap(_ref) {
59
59
  }, [api, connection]);
60
60
  if (connection == null || error != null) {
61
61
  return /*#__PURE__*/React.createElement(LoadingOverlay, {
62
+ "data-testid": "connection-bootstrap-loading",
62
63
  isLoading: connection == null,
63
64
  errorMessage: "".concat(error)
64
65
  });
@@ -1 +1 @@
1
- {"version":3,"file":"ConnectionBootstrap.js","names":["React","createContext","useEffect","useState","LoadingOverlay","useApi","Log","useClient","log","module","ConnectionContext","ConnectionBootstrap","children","api","client","error","setError","connection","setConnection","initConnection","isCancelled","loadConnection","newConnection","getAsIdeConnection","e","listenForShutdown","handleShutdown","event","detail","info","JSON","stringify","removerFn","addEventListener","IdeConnection","EVENT_SHUTDOWN"],"sources":["../../src/components/ConnectionBootstrap.tsx"],"sourcesContent":["import React, { createContext, useEffect, useState } from 'react';\nimport { LoadingOverlay } from '@deephaven/components';\nimport { useApi } from '@deephaven/jsapi-bootstrap';\nimport { IdeConnection } from '@deephaven/jsapi-types';\nimport Log from '@deephaven/log';\nimport useClient from './useClient';\n\nconst log = Log.module('@deephaven/jsapi-components.ConnectionBootstrap');\n\nexport const ConnectionContext = createContext<IdeConnection | null>(null);\n\nexport type ConnectionBootstrapProps = {\n /**\n * The children to render wrapped with the ConnectionContext.\n * Will not render children until the connection is created.\n */\n children: React.ReactNode;\n};\n\n/**\n * ConnectionBootstrap component. Handles initializing the connection.\n */\nexport function ConnectionBootstrap({ children }: ConnectionBootstrapProps) {\n const api = useApi();\n const client = useClient();\n const [error, setError] = useState<unknown>();\n const [connection, setConnection] = useState<IdeConnection>();\n useEffect(\n function initConnection() {\n let isCancelled = false;\n async function loadConnection() {\n try {\n const newConnection = await client.getAsIdeConnection();\n if (isCancelled) {\n return;\n }\n setConnection(newConnection);\n } catch (e) {\n if (isCancelled) {\n return;\n }\n setError(e);\n }\n }\n loadConnection();\n return () => {\n isCancelled = true;\n };\n },\n [api, client]\n );\n\n useEffect(\n function listenForShutdown() {\n if (connection == null) return;\n\n function handleShutdown(event: CustomEvent) {\n const { detail } = event;\n log.info('Shutdown', `${JSON.stringify(detail)}`);\n setError(`Server shutdown: ${detail ?? 'Unknown reason'}`);\n }\n\n const removerFn = connection.addEventListener(\n api.IdeConnection.EVENT_SHUTDOWN,\n handleShutdown\n );\n return removerFn;\n },\n [api, connection]\n );\n\n if (connection == null || error != null) {\n return (\n <LoadingOverlay\n isLoading={connection == null}\n errorMessage={`${error}`}\n />\n );\n }\n\n return (\n <ConnectionContext.Provider value={connection}>\n {children}\n </ConnectionContext.Provider>\n );\n}\n\nexport default ConnectionBootstrap;\n"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,aAAa,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AACjE,SAASC,cAAc,QAAQ,uBAAuB;AACtD,SAASC,MAAM,QAAQ,4BAA4B;AAEnD,OAAOC,GAAG,MAAM,gBAAgB;AAAC,OAC1BC,SAAS;AAEhB,IAAMC,GAAG,GAAGF,GAAG,CAACG,MAAM,CAAC,iDAAiD,CAAC;AAEzE,OAAO,IAAMC,iBAAiB,gBAAGT,aAAa,CAAuB,IAAI,CAAC;AAU1E;AACA;AACA;AACA,OAAO,SAASU,mBAAmB,OAAyC;EAAA,IAAxC;IAAEC;EAAmC,CAAC;EACxE,IAAMC,GAAG,GAAGR,MAAM,EAAE;EACpB,IAAMS,MAAM,GAAGP,SAAS,EAAE;EAC1B,IAAM,CAACQ,KAAK,EAAEC,QAAQ,CAAC,GAAGb,QAAQ,EAAW;EAC7C,IAAM,CAACc,UAAU,EAAEC,aAAa,CAAC,GAAGf,QAAQ,EAAiB;EAC7DD,SAAS,CACP,SAASiB,cAAc,GAAG;IACxB,IAAIC,WAAW,GAAG,KAAK;IAAC,SACTC,cAAc;MAAA;IAAA;IAAA;MAAA,oCAA7B,aAAgC;QAC9B,IAAI;UACF,IAAMC,aAAa,SAASR,MAAM,CAACS,kBAAkB,EAAE;UACvD,IAAIH,WAAW,EAAE;YACf;UACF;UACAF,aAAa,CAACI,aAAa,CAAC;QAC9B,CAAC,CAAC,OAAOE,CAAC,EAAE;UACV,IAAIJ,WAAW,EAAE;YACf;UACF;UACAJ,QAAQ,CAACQ,CAAC,CAAC;QACb;MACF,CAAC;MAAA;IAAA;IACDH,cAAc,EAAE;IAChB,OAAO,MAAM;MACXD,WAAW,GAAG,IAAI;IACpB,CAAC;EACH,CAAC,EACD,CAACP,GAAG,EAAEC,MAAM,CAAC,CACd;EAEDZ,SAAS,CACP,SAASuB,iBAAiB,GAAG;IAC3B,IAAIR,UAAU,IAAI,IAAI,EAAE;IAExB,SAASS,cAAc,CAACC,KAAkB,EAAE;MAC1C,IAAM;QAAEC;MAAO,CAAC,GAAGD,KAAK;MACxBnB,GAAG,CAACqB,IAAI,CAAC,UAAU,YAAKC,IAAI,CAACC,SAAS,CAACH,MAAM,CAAC,EAAG;MACjDZ,QAAQ,4BAAqBY,MAAM,aAANA,MAAM,cAANA,MAAM,GAAI,gBAAgB,EAAG;IAC5D;IAEA,IAAMI,SAAS,GAAGf,UAAU,CAACgB,gBAAgB,CAC3CpB,GAAG,CAACqB,aAAa,CAACC,cAAc,EAChCT,cAAc,CACf;IACD,OAAOM,SAAS;EAClB,CAAC,EACD,CAACnB,GAAG,EAAEI,UAAU,CAAC,CAClB;EAED,IAAIA,UAAU,IAAI,IAAI,IAAIF,KAAK,IAAI,IAAI,EAAE;IACvC,oBACE,oBAAC,cAAc;MACb,SAAS,EAAEE,UAAU,IAAI,IAAK;MAC9B,YAAY,YAAKF,KAAK;IAAG,EACzB;EAEN;EAEA,oBACE,oBAAC,iBAAiB,CAAC,QAAQ;IAAC,KAAK,EAAEE;EAAW,GAC3CL,QAAQ,CACkB;AAEjC;AAEA,eAAeD,mBAAmB"}
1
+ {"version":3,"file":"ConnectionBootstrap.js","names":["React","createContext","useEffect","useState","LoadingOverlay","useApi","Log","useClient","log","module","ConnectionContext","ConnectionBootstrap","children","api","client","error","setError","connection","setConnection","initConnection","isCancelled","loadConnection","newConnection","getAsIdeConnection","e","listenForShutdown","handleShutdown","event","detail","info","JSON","stringify","removerFn","addEventListener","IdeConnection","EVENT_SHUTDOWN"],"sources":["../../src/components/ConnectionBootstrap.tsx"],"sourcesContent":["import React, { createContext, useEffect, useState } from 'react';\nimport { LoadingOverlay } from '@deephaven/components';\nimport { useApi } from '@deephaven/jsapi-bootstrap';\nimport { IdeConnection } from '@deephaven/jsapi-types';\nimport Log from '@deephaven/log';\nimport useClient from './useClient';\n\nconst log = Log.module('@deephaven/jsapi-components.ConnectionBootstrap');\n\nexport const ConnectionContext = createContext<IdeConnection | null>(null);\n\nexport type ConnectionBootstrapProps = {\n /**\n * The children to render wrapped with the ConnectionContext.\n * Will not render children until the connection is created.\n */\n children: React.ReactNode;\n};\n\n/**\n * ConnectionBootstrap component. Handles initializing the connection.\n */\nexport function ConnectionBootstrap({ children }: ConnectionBootstrapProps) {\n const api = useApi();\n const client = useClient();\n const [error, setError] = useState<unknown>();\n const [connection, setConnection] = useState<IdeConnection>();\n useEffect(\n function initConnection() {\n let isCancelled = false;\n async function loadConnection() {\n try {\n const newConnection = await client.getAsIdeConnection();\n if (isCancelled) {\n return;\n }\n setConnection(newConnection);\n } catch (e) {\n if (isCancelled) {\n return;\n }\n setError(e);\n }\n }\n loadConnection();\n return () => {\n isCancelled = true;\n };\n },\n [api, client]\n );\n\n useEffect(\n function listenForShutdown() {\n if (connection == null) return;\n\n function handleShutdown(event: CustomEvent) {\n const { detail } = event;\n log.info('Shutdown', `${JSON.stringify(detail)}`);\n setError(`Server shutdown: ${detail ?? 'Unknown reason'}`);\n }\n\n const removerFn = connection.addEventListener(\n api.IdeConnection.EVENT_SHUTDOWN,\n handleShutdown\n );\n return removerFn;\n },\n [api, connection]\n );\n\n if (connection == null || error != null) {\n return (\n <LoadingOverlay\n data-testid=\"connection-bootstrap-loading\"\n isLoading={connection == null}\n errorMessage={`${error}`}\n />\n );\n }\n\n return (\n <ConnectionContext.Provider value={connection}>\n {children}\n </ConnectionContext.Provider>\n );\n}\n\nexport default ConnectionBootstrap;\n"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,aAAa,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AACjE,SAASC,cAAc,QAAQ,uBAAuB;AACtD,SAASC,MAAM,QAAQ,4BAA4B;AAEnD,OAAOC,GAAG,MAAM,gBAAgB;AAAC,OAC1BC,SAAS;AAEhB,IAAMC,GAAG,GAAGF,GAAG,CAACG,MAAM,CAAC,iDAAiD,CAAC;AAEzE,OAAO,IAAMC,iBAAiB,gBAAGT,aAAa,CAAuB,IAAI,CAAC;AAU1E;AACA;AACA;AACA,OAAO,SAASU,mBAAmB,OAAyC;EAAA,IAAxC;IAAEC;EAAmC,CAAC;EACxE,IAAMC,GAAG,GAAGR,MAAM,EAAE;EACpB,IAAMS,MAAM,GAAGP,SAAS,EAAE;EAC1B,IAAM,CAACQ,KAAK,EAAEC,QAAQ,CAAC,GAAGb,QAAQ,EAAW;EAC7C,IAAM,CAACc,UAAU,EAAEC,aAAa,CAAC,GAAGf,QAAQ,EAAiB;EAC7DD,SAAS,CACP,SAASiB,cAAc,GAAG;IACxB,IAAIC,WAAW,GAAG,KAAK;IAAC,SACTC,cAAc;MAAA;IAAA;IAAA;MAAA,oCAA7B,aAAgC;QAC9B,IAAI;UACF,IAAMC,aAAa,SAASR,MAAM,CAACS,kBAAkB,EAAE;UACvD,IAAIH,WAAW,EAAE;YACf;UACF;UACAF,aAAa,CAACI,aAAa,CAAC;QAC9B,CAAC,CAAC,OAAOE,CAAC,EAAE;UACV,IAAIJ,WAAW,EAAE;YACf;UACF;UACAJ,QAAQ,CAACQ,CAAC,CAAC;QACb;MACF,CAAC;MAAA;IAAA;IACDH,cAAc,EAAE;IAChB,OAAO,MAAM;MACXD,WAAW,GAAG,IAAI;IACpB,CAAC;EACH,CAAC,EACD,CAACP,GAAG,EAAEC,MAAM,CAAC,CACd;EAEDZ,SAAS,CACP,SAASuB,iBAAiB,GAAG;IAC3B,IAAIR,UAAU,IAAI,IAAI,EAAE;IAExB,SAASS,cAAc,CAACC,KAAkB,EAAE;MAC1C,IAAM;QAAEC;MAAO,CAAC,GAAGD,KAAK;MACxBnB,GAAG,CAACqB,IAAI,CAAC,UAAU,YAAKC,IAAI,CAACC,SAAS,CAACH,MAAM,CAAC,EAAG;MACjDZ,QAAQ,4BAAqBY,MAAM,aAANA,MAAM,cAANA,MAAM,GAAI,gBAAgB,EAAG;IAC5D;IAEA,IAAMI,SAAS,GAAGf,UAAU,CAACgB,gBAAgB,CAC3CpB,GAAG,CAACqB,aAAa,CAACC,cAAc,EAChCT,cAAc,CACf;IACD,OAAOM,SAAS;EAClB,CAAC,EACD,CAACnB,GAAG,EAAEI,UAAU,CAAC,CAClB;EAED,IAAIA,UAAU,IAAI,IAAI,IAAIF,KAAK,IAAI,IAAI,EAAE;IACvC,oBACE,oBAAC,cAAc;MACb,eAAY,8BAA8B;MAC1C,SAAS,EAAEE,UAAU,IAAI,IAAK;MAC9B,YAAY,YAAKF,KAAK;IAAG,EACzB;EAEN;EAEA,oBACE,oBAAC,iBAAiB,CAAC,QAAQ;IAAC,KAAK,EAAEE;EAAW,GAC3CL,QAAQ,CACkB;AAEjC;AAEA,eAAeD,mBAAmB"}
@@ -7,7 +7,9 @@ export function FontsLoaded(_ref) {
7
7
  } = _ref;
8
8
  var isFontsLoaded = useContext(FontsLoadedContext);
9
9
  if (!isFontsLoaded) {
10
- return /*#__PURE__*/React.createElement(LoadingOverlay, null);
10
+ return /*#__PURE__*/React.createElement(LoadingOverlay, {
11
+ "data-testid": "fonts-loaded-loading"
12
+ });
11
13
  }
12
14
 
13
15
  // eslint-disable-next-line react/jsx-no-useless-fragment
@@ -1 +1 @@
1
- {"version":3,"file":"FontsLoaded.js","names":["React","useContext","LoadingOverlay","FontsLoadedContext","FontsLoaded","children","isFontsLoaded"],"sources":["../../src/components/FontsLoaded.tsx"],"sourcesContent":["import React, { useContext } from 'react';\nimport { LoadingOverlay } from '@deephaven/components';\nimport { FontsLoadedContext } from './FontBootstrap';\n\nexport type FontsLoadedProps = {\n /** Children to show when the fonts have completed loading */\n children: React.ReactNode;\n};\n\nexport function FontsLoaded({ children }: FontsLoadedProps) {\n const isFontsLoaded = useContext(FontsLoadedContext);\n\n if (!isFontsLoaded) {\n return <LoadingOverlay />;\n }\n\n // eslint-disable-next-line react/jsx-no-useless-fragment\n return <>{children}</>;\n}\n\nexport default FontsLoaded;\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AACzC,SAASC,cAAc,QAAQ,uBAAuB;AAAC,SAC9CC,kBAAkB;AAO3B,OAAO,SAASC,WAAW,OAAiC;EAAA,IAAhC;IAAEC;EAA2B,CAAC;EACxD,IAAMC,aAAa,GAAGL,UAAU,CAACE,kBAAkB,CAAC;EAEpD,IAAI,CAACG,aAAa,EAAE;IAClB,oBAAO,oBAAC,cAAc,OAAG;EAC3B;;EAEA;EACA,oBAAO,0CAAGD,QAAQ,CAAI;AACxB;AAEA,eAAeD,WAAW"}
1
+ {"version":3,"file":"FontsLoaded.js","names":["React","useContext","LoadingOverlay","FontsLoadedContext","FontsLoaded","children","isFontsLoaded"],"sources":["../../src/components/FontsLoaded.tsx"],"sourcesContent":["import React, { useContext } from 'react';\nimport { LoadingOverlay } from '@deephaven/components';\nimport { FontsLoadedContext } from './FontBootstrap';\n\nexport type FontsLoadedProps = {\n /** Children to show when the fonts have completed loading */\n children: React.ReactNode;\n};\n\nexport function FontsLoaded({ children }: FontsLoadedProps) {\n const isFontsLoaded = useContext(FontsLoadedContext);\n\n if (!isFontsLoaded) {\n return <LoadingOverlay data-testid=\"fonts-loaded-loading\" />;\n }\n\n // eslint-disable-next-line react/jsx-no-useless-fragment\n return <>{children}</>;\n}\n\nexport default FontsLoaded;\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AACzC,SAASC,cAAc,QAAQ,uBAAuB;AAAC,SAC9CC,kBAAkB;AAO3B,OAAO,SAASC,WAAW,OAAiC;EAAA,IAAhC;IAAEC;EAA2B,CAAC;EACxD,IAAMC,aAAa,GAAGL,UAAU,CAACE,kBAAkB,CAAC;EAEpD,IAAI,CAACG,aAAa,EAAE;IAClB,oBAAO,oBAAC,cAAc;MAAC,eAAY;IAAsB,EAAG;EAC9D;;EAEA;EACA,oBAAO,0CAAGD,QAAQ,CAAI;AACxB;AAEA,eAAeD,WAAW"}
@@ -1,6 +1,5 @@
1
1
  import React, { ForwardRefExoticComponent } from 'react';
2
2
  import { AuthPlugin, AuthPluginComponent } from '@deephaven/auth-plugins';
3
- import { CoreClient } from '@deephaven/jsapi-types';
4
3
  export interface PluginModule {
5
4
  }
6
5
  export type PluginModuleMap = Map<string, PluginModule>;
@@ -44,5 +43,5 @@ export declare function getAuthHandlers(authConfigValues: Map<string, string>):
44
43
  * @param corePlugins Map of core auth plugins to include in the list. They are added after the loaded plugins
45
44
  * @returns The auth plugin component to render
46
45
  */
47
- export declare function getAuthPluginComponent(client: CoreClient, pluginMap: PluginModuleMap, authConfigValues: Map<string, string>, corePlugins?: Map<string, AuthPlugin>): AuthPluginComponent;
46
+ export declare function getAuthPluginComponent(pluginMap: PluginModuleMap, authConfigValues: Map<string, string>, corePlugins?: Map<string, AuthPlugin>): AuthPluginComponent;
48
47
  //# sourceMappingURL=PluginUtils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"PluginUtils.d.ts","sourceRoot":"","sources":["../../src/plugins/PluginUtils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EACL,UAAU,EACV,mBAAmB,EAEpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AASpD,MAAM,WAAW,YAAY;CAAG;AAEhC,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAExD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,GAAG,EACZ,UAAU,EAAE,MAAM,GACjB,yBAAyB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAqBzD;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAG1E;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,CAAC,CAUxD;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,eAAe,CAAC,CAmC1B;AAED,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM,EAAE,CAEV;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,eAAe,EAC1B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,GACpC,mBAAmB,CAqCrB"}
1
+ {"version":3,"file":"PluginUtils.d.ts","sourceRoot":"","sources":["../../src/plugins/PluginUtils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EACL,UAAU,EACV,mBAAmB,EAEpB,MAAM,yBAAyB,CAAC;AASjC,MAAM,WAAW,YAAY;CAAG;AAEhC,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAExD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,GAAG,EACZ,UAAU,EAAE,MAAM,GACjB,yBAAyB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAqBzD;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAG1E;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,CAAC,CAUxD;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,eAAe,CAAC,CAmC1B;AAED,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM,EAAE,CAEV;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,eAAe,EAC1B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,GACpC,mBAAmB,CAqCrB"}
@@ -148,7 +148,7 @@ export function getAuthHandlers(authConfigValues) {
148
148
  * @param corePlugins Map of core auth plugins to include in the list. They are added after the loaded plugins
149
149
  * @returns The auth plugin component to render
150
150
  */
151
- export function getAuthPluginComponent(client, pluginMap, authConfigValues, corePlugins) {
151
+ export function getAuthPluginComponent(pluginMap, authConfigValues, corePlugins) {
152
152
  var authHandlers = getAuthHandlers(authConfigValues);
153
153
  // Filter out all the plugins that are auth plugins, and then map them to [pluginName, AuthPlugin] pairs
154
154
  // Uses some pretty disgusting casting, because TypeScript wants to treat it as an (string | AuthPlugin)[] array instead
@@ -1 +1 @@
1
- {"version":3,"file":"PluginUtils.js","names":["React","isAuthPlugin","Log","RemoteComponent","loadRemoteModule","log","module","loadComponentPlugin","baseURL","pluginName","pluginUrl","URL","Plugin","forwardRef","props","ref","href","err","Component","errorMessage","error","displayName","loadModulePlugin","myModule","loadJson","jsonUrl","res","fetch","ok","Error","statusText","json","loadModulePlugins","modulePluginsUrl","debug","manifest","Array","isArray","plugins","pluginPromises","i","length","name","main","pluginMainUrl","push","pluginModules","Promise","allSettled","pluginMap","Map","status","set","value","reason","info","e","getAuthHandlers","authConfigValues","get","split","getAuthPluginComponent","client","corePlugins","authHandlers","authPlugins","entries","filter","plugin","AuthPlugin","map","availableAuthPlugins","authPlugin","isAvailable","warn","join","loginPluginName","NewLoginPlugin"],"sources":["../../src/plugins/PluginUtils.tsx"],"sourcesContent":["import React, { ForwardRefExoticComponent } from 'react';\nimport {\n AuthPlugin,\n AuthPluginComponent,\n isAuthPlugin,\n} from '@deephaven/auth-plugins';\nimport { CoreClient } from '@deephaven/jsapi-types';\nimport Log from '@deephaven/log';\nimport RemoteComponent from './RemoteComponent';\nimport loadRemoteModule from './loadRemoteModule';\n\nconst log = Log.module('@deephaven/app-utils.PluginUtils');\n\n// A PluginModule. This interface should have new fields added to it from different levels of plugins.\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PluginModule {}\n\nexport type PluginModuleMap = Map<string, PluginModule>;\n\n/**\n * Load a component plugin from the server.\n * @param baseURL Base URL of the plugin server\n * @param pluginName Name of the component plugin to load\n * @returns A lazily loaded JSX.Element from the plugin\n */\nexport function loadComponentPlugin(\n baseURL: URL,\n pluginName: string\n): ForwardRefExoticComponent<React.RefAttributes<unknown>> {\n const pluginUrl = new URL(`${pluginName}.js`, baseURL);\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n const Plugin: any = React.forwardRef((props, ref) => (\n <RemoteComponent\n url={pluginUrl.href}\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n render={({ err, Component }: { err: unknown; Component: any }) => {\n if (err != null && err !== '') {\n const errorMessage = `Error loading plugin ${pluginName} from ${pluginUrl} due to ${err}`;\n log.error(errorMessage);\n return <div className=\"error-message\">{`${errorMessage}`}</div>;\n }\n // eslint-disable-next-line react/jsx-props-no-spreading\n return <Component ref={ref} {...props} />;\n }}\n />\n ));\n Plugin.pluginName = pluginName;\n Plugin.displayName = 'Plugin';\n return Plugin;\n}\n\n/**\n * Imports a commonjs plugin module from the provided URL\n * @param pluginUrl The URL of the plugin to load\n * @returns The loaded module\n */\nexport async function loadModulePlugin(pluginUrl: string): Promise<unknown> {\n const myModule = await loadRemoteModule(pluginUrl);\n return myModule;\n}\n\n/**\n * Loads a JSON file and returns the JSON object\n * @param jsonUrl The URL of the JSON file to load\n * @returns The JSON object of the manifest file\n */\nexport async function loadJson(\n jsonUrl: string\n): Promise<{ plugins: { name: string; main: string }[] }> {\n const res = await fetch(jsonUrl);\n if (!res.ok) {\n throw new Error(res.statusText);\n }\n try {\n return await res.json();\n } catch {\n throw new Error('Could not be parsed as JSON');\n }\n}\n\n/**\n * Load all plugin modules available.\n * @param modulePluginsUrl The base URL of the module plugins to load\n * @returns A map from the name of the plugin to the plugin module that was loaded\n */\nexport async function loadModulePlugins(\n modulePluginsUrl: string\n): Promise<PluginModuleMap> {\n log.debug('Loading plugins...');\n try {\n const manifest = await loadJson(`${modulePluginsUrl}/manifest.json`);\n\n if (!Array.isArray(manifest.plugins)) {\n throw new Error('Plugin manifest JSON does not contain plugins array');\n }\n\n log.debug('Plugin manifest loaded:', manifest);\n const pluginPromises: Promise<unknown>[] = [];\n for (let i = 0; i < manifest.plugins.length; i += 1) {\n const { name, main } = manifest.plugins[i];\n const pluginMainUrl = `${modulePluginsUrl}/${name}/${main}`;\n pluginPromises.push(loadModulePlugin(pluginMainUrl));\n }\n const pluginModules = await Promise.allSettled(pluginPromises);\n\n const pluginMap: PluginModuleMap = new Map();\n for (let i = 0; i < pluginModules.length; i += 1) {\n const module = pluginModules[i];\n const { name } = manifest.plugins[i];\n if (module.status === 'fulfilled') {\n pluginMap.set(name, module.value as PluginModule);\n } else {\n log.error(`Unable to load plugin ${name}`, module.reason);\n }\n }\n log.info('Plugins loaded:', pluginMap);\n\n return pluginMap;\n } catch (e) {\n log.error('Unable to load plugins:', e);\n return new Map();\n }\n}\n\nexport function getAuthHandlers(\n authConfigValues: Map<string, string>\n): string[] {\n return authConfigValues.get('AuthHandlers')?.split(',') ?? [];\n}\n\n/**\n * Get the auth plugin component from the plugin map and current configuration\n * Throws if no auth plugin is available\n *\n * @param pluginMap Map of plugins loaded from the server\n * @param authConfigValues Auth config values from the server\n * @param corePlugins Map of core auth plugins to include in the list. They are added after the loaded plugins\n * @returns The auth plugin component to render\n */\nexport function getAuthPluginComponent(\n client: CoreClient,\n pluginMap: PluginModuleMap,\n authConfigValues: Map<string, string>,\n corePlugins?: Map<string, AuthPlugin>\n): AuthPluginComponent {\n const authHandlers = getAuthHandlers(authConfigValues);\n // Filter out all the plugins that are auth plugins, and then map them to [pluginName, AuthPlugin] pairs\n // Uses some pretty disgusting casting, because TypeScript wants to treat it as an (string | AuthPlugin)[] array instead\n const authPlugins = ([\n ...pluginMap.entries(),\n ].filter(([, plugin]: [string, { AuthPlugin?: AuthPlugin }]) =>\n isAuthPlugin(plugin.AuthPlugin)\n ) as [string, { AuthPlugin: AuthPlugin }][]).map(([name, plugin]) => [\n name,\n plugin.AuthPlugin,\n ]) as [string, AuthPlugin][];\n\n // Add all the core plugins in priority\n authPlugins.push(...(corePlugins ?? []));\n\n // Filter the available auth plugins\n\n const availableAuthPlugins = authPlugins.filter(([name, authPlugin]) =>\n authPlugin.isAvailable(authHandlers)\n );\n\n if (availableAuthPlugins.length === 0) {\n throw new Error(\n `No login plugins found, please register a login plugin for auth handlers: ${authHandlers}`\n );\n } else if (availableAuthPlugins.length > 1) {\n log.warn(\n 'More than one login plugin available, will use the first one: ',\n availableAuthPlugins.map(([name]) => name).join(', ')\n );\n }\n\n const [loginPluginName, NewLoginPlugin] = availableAuthPlugins[0];\n log.info('Using LoginPlugin', loginPluginName);\n\n return NewLoginPlugin.Component;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"PluginUtils.js","names":["React","isAuthPlugin","Log","RemoteComponent","loadRemoteModule","log","module","loadComponentPlugin","baseURL","pluginName","pluginUrl","URL","Plugin","forwardRef","props","ref","href","err","Component","errorMessage","error","displayName","loadModulePlugin","myModule","loadJson","jsonUrl","res","fetch","ok","Error","statusText","json","loadModulePlugins","modulePluginsUrl","debug","manifest","Array","isArray","plugins","pluginPromises","i","length","name","main","pluginMainUrl","push","pluginModules","Promise","allSettled","pluginMap","Map","status","set","value","reason","info","e","getAuthHandlers","authConfigValues","get","split","getAuthPluginComponent","corePlugins","authHandlers","authPlugins","entries","filter","plugin","AuthPlugin","map","availableAuthPlugins","authPlugin","isAvailable","warn","join","loginPluginName","NewLoginPlugin"],"sources":["../../src/plugins/PluginUtils.tsx"],"sourcesContent":["import React, { ForwardRefExoticComponent } from 'react';\nimport {\n AuthPlugin,\n AuthPluginComponent,\n isAuthPlugin,\n} from '@deephaven/auth-plugins';\nimport Log from '@deephaven/log';\nimport RemoteComponent from './RemoteComponent';\nimport loadRemoteModule from './loadRemoteModule';\n\nconst log = Log.module('@deephaven/app-utils.PluginUtils');\n\n// A PluginModule. This interface should have new fields added to it from different levels of plugins.\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PluginModule {}\n\nexport type PluginModuleMap = Map<string, PluginModule>;\n\n/**\n * Load a component plugin from the server.\n * @param baseURL Base URL of the plugin server\n * @param pluginName Name of the component plugin to load\n * @returns A lazily loaded JSX.Element from the plugin\n */\nexport function loadComponentPlugin(\n baseURL: URL,\n pluginName: string\n): ForwardRefExoticComponent<React.RefAttributes<unknown>> {\n const pluginUrl = new URL(`${pluginName}.js`, baseURL);\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n const Plugin: any = React.forwardRef((props, ref) => (\n <RemoteComponent\n url={pluginUrl.href}\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n render={({ err, Component }: { err: unknown; Component: any }) => {\n if (err != null && err !== '') {\n const errorMessage = `Error loading plugin ${pluginName} from ${pluginUrl} due to ${err}`;\n log.error(errorMessage);\n return <div className=\"error-message\">{`${errorMessage}`}</div>;\n }\n // eslint-disable-next-line react/jsx-props-no-spreading\n return <Component ref={ref} {...props} />;\n }}\n />\n ));\n Plugin.pluginName = pluginName;\n Plugin.displayName = 'Plugin';\n return Plugin;\n}\n\n/**\n * Imports a commonjs plugin module from the provided URL\n * @param pluginUrl The URL of the plugin to load\n * @returns The loaded module\n */\nexport async function loadModulePlugin(pluginUrl: string): Promise<unknown> {\n const myModule = await loadRemoteModule(pluginUrl);\n return myModule;\n}\n\n/**\n * Loads a JSON file and returns the JSON object\n * @param jsonUrl The URL of the JSON file to load\n * @returns The JSON object of the manifest file\n */\nexport async function loadJson(\n jsonUrl: string\n): Promise<{ plugins: { name: string; main: string }[] }> {\n const res = await fetch(jsonUrl);\n if (!res.ok) {\n throw new Error(res.statusText);\n }\n try {\n return await res.json();\n } catch {\n throw new Error('Could not be parsed as JSON');\n }\n}\n\n/**\n * Load all plugin modules available.\n * @param modulePluginsUrl The base URL of the module plugins to load\n * @returns A map from the name of the plugin to the plugin module that was loaded\n */\nexport async function loadModulePlugins(\n modulePluginsUrl: string\n): Promise<PluginModuleMap> {\n log.debug('Loading plugins...');\n try {\n const manifest = await loadJson(`${modulePluginsUrl}/manifest.json`);\n\n if (!Array.isArray(manifest.plugins)) {\n throw new Error('Plugin manifest JSON does not contain plugins array');\n }\n\n log.debug('Plugin manifest loaded:', manifest);\n const pluginPromises: Promise<unknown>[] = [];\n for (let i = 0; i < manifest.plugins.length; i += 1) {\n const { name, main } = manifest.plugins[i];\n const pluginMainUrl = `${modulePluginsUrl}/${name}/${main}`;\n pluginPromises.push(loadModulePlugin(pluginMainUrl));\n }\n const pluginModules = await Promise.allSettled(pluginPromises);\n\n const pluginMap: PluginModuleMap = new Map();\n for (let i = 0; i < pluginModules.length; i += 1) {\n const module = pluginModules[i];\n const { name } = manifest.plugins[i];\n if (module.status === 'fulfilled') {\n pluginMap.set(name, module.value as PluginModule);\n } else {\n log.error(`Unable to load plugin ${name}`, module.reason);\n }\n }\n log.info('Plugins loaded:', pluginMap);\n\n return pluginMap;\n } catch (e) {\n log.error('Unable to load plugins:', e);\n return new Map();\n }\n}\n\nexport function getAuthHandlers(\n authConfigValues: Map<string, string>\n): string[] {\n return authConfigValues.get('AuthHandlers')?.split(',') ?? [];\n}\n\n/**\n * Get the auth plugin component from the plugin map and current configuration\n * Throws if no auth plugin is available\n *\n * @param pluginMap Map of plugins loaded from the server\n * @param authConfigValues Auth config values from the server\n * @param corePlugins Map of core auth plugins to include in the list. They are added after the loaded plugins\n * @returns The auth plugin component to render\n */\nexport function getAuthPluginComponent(\n pluginMap: PluginModuleMap,\n authConfigValues: Map<string, string>,\n corePlugins?: Map<string, AuthPlugin>\n): AuthPluginComponent {\n const authHandlers = getAuthHandlers(authConfigValues);\n // Filter out all the plugins that are auth plugins, and then map them to [pluginName, AuthPlugin] pairs\n // Uses some pretty disgusting casting, because TypeScript wants to treat it as an (string | AuthPlugin)[] array instead\n const authPlugins = ([\n ...pluginMap.entries(),\n ].filter(([, plugin]: [string, { AuthPlugin?: AuthPlugin }]) =>\n isAuthPlugin(plugin.AuthPlugin)\n ) as [string, { AuthPlugin: AuthPlugin }][]).map(([name, plugin]) => [\n name,\n plugin.AuthPlugin,\n ]) as [string, AuthPlugin][];\n\n // Add all the core plugins in priority\n authPlugins.push(...(corePlugins ?? []));\n\n // Filter the available auth plugins\n\n const availableAuthPlugins = authPlugins.filter(([name, authPlugin]) =>\n authPlugin.isAvailable(authHandlers)\n );\n\n if (availableAuthPlugins.length === 0) {\n throw new Error(\n `No login plugins found, please register a login plugin for auth handlers: ${authHandlers}`\n );\n } else if (availableAuthPlugins.length > 1) {\n log.warn(\n 'More than one login plugin available, will use the first one: ',\n availableAuthPlugins.map(([name]) => name).join(', ')\n );\n }\n\n const [loginPluginName, NewLoginPlugin] = availableAuthPlugins[0];\n log.info('Using LoginPlugin', loginPluginName);\n\n return NewLoginPlugin.Component;\n}\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@deephaven/app-utils",
3
- "version": "0.33.1-auth-plugins.25+2a689a65",
3
+ "version": "0.37.0",
4
4
  "description": "Deephaven App Utils",
5
5
  "author": "Deephaven Data Labs LLC",
6
6
  "license": "Apache-2.0",
@@ -22,18 +22,18 @@
22
22
  "build:babel": "babel ./src --out-dir ./dist --extensions \".ts,.tsx,.js,.jsx\" --source-maps --root-mode upward"
23
23
  },
24
24
  "devDependencies": {
25
- "@deephaven/redux": "^0.33.1-auth-plugins.25+2a689a65",
25
+ "@deephaven/redux": "^0.37.0",
26
26
  "react": "^17.x",
27
27
  "react-dom": "^17.x",
28
28
  "react-redux": "^7.x",
29
29
  "redux": "^4.x"
30
30
  },
31
31
  "dependencies": {
32
- "@deephaven/auth-plugins": "^0.33.1-auth-plugins.25+2a689a65",
33
- "@deephaven/components": "^0.33.1-auth-plugins.25+2a689a65",
34
- "@deephaven/jsapi-bootstrap": "^0.33.1-auth-plugins.25+2a689a65",
35
- "@deephaven/jsapi-types": "^0.33.1-auth-plugins.25+2a689a65",
36
- "@deephaven/log": "^0.33.1-auth-plugins.25+2a689a65",
32
+ "@deephaven/auth-plugins": "^0.37.0",
33
+ "@deephaven/components": "^0.37.0",
34
+ "@deephaven/jsapi-bootstrap": "^0.37.0",
35
+ "@deephaven/jsapi-types": "^0.37.0",
36
+ "@deephaven/log": "^0.37.0",
37
37
  "@paciolan/remote-component": "2.13.0",
38
38
  "@paciolan/remote-module-loader": "^3.0.2",
39
39
  "fira": "mozilla/fira#4.202"
@@ -54,5 +54,5 @@
54
54
  "publishConfig": {
55
55
  "access": "public"
56
56
  },
57
- "gitHead": "2a689a654f019c33259582f8196ea9acf64497e9"
57
+ "gitHead": "de7a110ea64f279ec37087bcbda9cf85d8c523f8"
58
58
  }