From 57ec7e225036924af3167a9a8d99c344c1b6e8d6 Mon Sep 17 00:00:00 2001 From: headphonejames Date: Tue, 28 Feb 2023 17:20:23 -0800 Subject: [PATCH] minor clean up Signed-off-by: headphonejames --- .../src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts | 4 ---- packages/core-app-api/src/apis/implementations/auth/types.ts | 1 + .../src/components/OAuthRequestDialog/OAuthRequestDialog.tsx | 1 + packages/core-components/src/layout/SignInPage/providers.tsx | 2 +- plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts | 1 + 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts index 4ca0ffc645..193c474361 100644 --- a/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts +++ b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts @@ -55,8 +55,4 @@ export default class MockOAuthApi implements OAuthRequestApi { }); }); } - - authFlow() { - return 'popup'; - } } diff --git a/packages/core-app-api/src/apis/implementations/auth/types.ts b/packages/core-app-api/src/apis/implementations/auth/types.ts index 08ddc5e659..7a74fd3a3b 100644 --- a/packages/core-app-api/src/apis/implementations/auth/types.ts +++ b/packages/core-app-api/src/apis/implementations/auth/types.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import { AuthProviderInfo, ConfigApi, diff --git a/packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx b/packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx index 3e6c685401..0159d8f503 100644 --- a/packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx +++ b/packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import { makeStyles, Theme } from '@material-ui/core/styles'; import Dialog from '@material-ui/core/Dialog'; import DialogActions from '@material-ui/core/DialogActions'; diff --git a/packages/core-components/src/layout/SignInPage/providers.tsx b/packages/core-components/src/layout/SignInPage/providers.tsx index 1f3db4da36..5e7ab7b7be 100644 --- a/packages/core-components/src/layout/SignInPage/providers.tsx +++ b/packages/core-components/src/layout/SignInPage/providers.tsx @@ -32,7 +32,7 @@ import { guestProvider } from './guestProvider'; import { customProvider } from './customProvider'; import { IdentityApiSignOutProxy } from './IdentityApiSignOutProxy'; -export const PROVIDER_STORAGE_KEY = '@backstage/core:SignInPage:provider'; +const PROVIDER_STORAGE_KEY = '@backstage/core:SignInPage:provider'; export type SignInProviderType = { [key: string]: { diff --git a/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts b/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts index b7aa5390fb..5f51b2d301 100644 --- a/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts +++ b/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts @@ -104,6 +104,7 @@ export class OAuthAdapter implements AuthProviderRouteHandlers { const origin = req.query.origin?.toString(); const redirectUrl = req.query.redirectUrl?.toString(); const flow = req.query.flow?.toString(); + if (!env) { throw new InputError('No env provided in request query parameters'); }