random-mirrors
/
cosmos-explorer
mirror of https://github.com/Azure/cosmos-explorer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollback DB endpoint use by AAD (#822)

This commit is contained in:
Zachary Foster 2021-05-25 00:21:52 -04:00 committed by GitHub
parent 0d79f01304
commit c42a10faa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/HostedExplorer.tsx
View File

@ -1,5 +1,5 @@
import { initializeIcons } from "@fluentui/react";
import { useBoolean } from "@fluentui/react-hooks";
import { initializeIcons } from "@fluentui/react";
import * as React from "react";
import { render } from "react-dom";
import ChevronRight from "../images/chevron-right.svg";
@ -7,7 +7,7 @@ import "../less/hostedexplorer.less";
import { AuthType } from "./AuthType";
import { DatabaseAccount } from "./Contracts/DataModels";
import "./Explorer/Menus/NavBar/MeControlComponent.less";
import { useAADAuth, useAADDataPlane } from "./hooks/useAADAuth";
import { useAADAuth } from "./hooks/useAADAuth";
import { useTokenMetadata } from "./hooks/usePortalAccessToken";
import { HostedExplorerChildFrame } from "./HostedExplorerChildFrame";
import { AccountSwitcher } from "./Platform/Hosted/Components/AccountSwitcher";
@ -31,9 +31,8 @@ const App: React.FunctionComponent = () => {
// For showing/hiding panel
const [isOpen, { setTrue: openPanel, setFalse: dismissPanel }] = useBoolean(false);
const { isLoggedIn, armToken, graphToken, account, tenantId, logout, login, switchTenant } = useAADAuth();
const { isLoggedIn, armToken, graphToken, aadToken, account, tenantId, logout, login, switchTenant } = useAADAuth();
const [databaseAccount, setDatabaseAccount] = React.useState<DatabaseAccount>();
const { aadToken } = useAADDataPlane(databaseAccount);
const [authType, setAuthType] = React.useState<AuthType>(encryptedToken ? AuthType.EncryptedToken : undefined);
const [connectionString, setConnectionString] = React.useState<string>();

20
src/hooks/useAADAuth.ts
View File

@ -1,7 +1,6 @@
import * as msal from "@azure/msal-browser";
import { useBoolean } from "@fluentui/react-hooks";
import * as React from "react";
import { DatabaseAccount } from "../Contracts/DataModels";
const config: msal.Configuration = {
cache: {
@ -105,22 +104,3 @@ export function useAADAuth(): ReturnType {
switchTenant,
};
}
export function useAADDataPlane(databaseAccount: DatabaseAccount): { aadToken: string } {
const [aadToken, setAadToken] = React.useState<string>();
React.useEffect(() => {
if (databaseAccount?.properties?.documentEndpoint) {
const hrefEndpoint = new URL(databaseAccount.properties.documentEndpoint).href.replace(/\/$/, "/.default");
msalInstance
.acquireTokenSilent({
scopes: [hrefEndpoint],
})
.then((aadTokenResponse) => {
setAadToken(aadTokenResponse.accessToken);
});
}
}, [databaseAccount]);
return { aadToken };
}