fix: enable SSO by default, add sso login function

niledatabase · Jul 17, 2023 · 28f6ced · 28f6ced
1 parent 5e4f984
commit 28f6ced
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 8 deletions.
diff --git a/packages/react/src/LoginForm/SingleSignOn.tsx b/packages/react/src/LoginForm/SingleSignOn.tsx
@@ -22,7 +22,7 @@ export default function SingleSignOnForm(
     beforeMutate,
     nextButtonText = 'Next',
     loginButtonText = 'Log in',
-    disableSSO = true,
+    disableSSO = false,
   } = props;
   const api = useApi();
   const [buttonText, setButtonText] = React.useState(

diff --git a/packages/react/src/SSO/BaseSSOForm.tsx b/packages/react/src/SSO/BaseSSOForm.tsx
@@ -3,6 +3,7 @@ import { useMutation } from '@tanstack/react-query';
 import { UpdateProviderRequest } from '@theniledev/browser';
 import Stack from '@mui/joy/Stack';
 import Typography from '@mui/joy/Typography';
+import { SSOProvider } from '@theniledev/browser';
 
 import SimpleForm from '../lib/SimpleForm';
 import { useApi } from '../context';
@@ -18,9 +19,10 @@ type SSOFormRequest = Omit<
   enabled: string;
 };
 export default function BaseSSOForm(
-  props: Omit<OktaProps, 'callbackUrl'> & {
+  props: Omit<OktaProps, 'callbackUrl' | 'providers'> & {
     providerName: string;
     configurationGuide: JSX.Element;
+    config: SSOProvider;
   }
 ) {
   const api = useApi();

diff --git a/packages/react/src/SSO/Okta.tsx b/packages/react/src/SSO/Okta.tsx
@@ -7,6 +7,7 @@ import CopyAll from '@mui/icons-material/CopyAll';
 import { Theme } from '@mui/joy/styles';
 import Tooltip from '@mui/joy/Tooltip';
 import CheckCircleOutlined from '@mui/icons-material/CheckCircleOutlined';
+import { SSOProvider } from '@theniledev/browser';
 
 import BaseSSOForm from './BaseSSOForm';
 import { OktaProps } from './types';
@@ -81,11 +82,12 @@ function ConfigGuide({ callbackUrl }: { callbackUrl: string }) {
 }
 
 export default function Okta(props: OktaProps) {
-  const { callbackUrl, ...remaining } = props;
-
+  const { callbackUrl, providers, ...remaining } = props;
+  const config = providers?.find((provider) => provider.provider === 'okta');
   return (
     <BaseSSOForm
       {...remaining}
+      config={config as SSOProvider}
       providerName="Okta"
       configurationGuide={<ConfigGuide callbackUrl={callbackUrl} />}
     />

diff --git a/packages/react/src/SSO/types.ts b/packages/react/src/SSO/types.ts
@@ -1,7 +1,7 @@
-import { GetSSOProviders200Response } from '@theniledev/browser';
+import { SSOProvider } from '@theniledev/browser';
 
 export type OktaProps = {
-  config: GetSSOProviders200Response;
+  providers: SSOProvider[];
   callbackUrl: string;
   onSuccess?: (data: unknown, variables: unknown) => void;
   onError?: (e: Error) => void;

diff --git a/packages/react/test/SSO/Okta.test.tsx b/packages/react/test/SSO/Okta.test.tsx
@@ -18,7 +18,11 @@ describe('Okta', () => {
     } as unknown as Client;
     render(
       <NileProvider api={api}>
-        <Okta onSuccess={onSuccess} />
+        <Okta
+          onSuccess={onSuccess}
+          callbackUrl="http://localhost:8080/workspaces/workspace/databases/database/tenants/tenantId/auth/oidc/callback"
+          providers={[]}
+        />
       </NileProvider>
     );
     const clientId = screen.getByLabelText('Client id');

diff --git a/packages/server/src/auth/auth.test.ts b/packages/server/src/auth/auth.test.ts
@@ -13,6 +13,7 @@ const baseConfig = [
   'listProviders',
   'listTenantProviders',
   'login',
+  'loginSSO',
   'loginSSOUrl',
   'signUp',
   'updateProvider',

diff --git a/packages/server/src/auth/index.ts b/packages/server/src/auth/index.ts
@@ -90,7 +90,27 @@ export default class Auth extends Config {
     return new Response(text, { status: res.status });
   };
 
-  // 'http://localhost:8080/workspaces/cheerful_flower/databases/dutiful_pliers/tenants/018950bd-440d-7058-8637-35ea224b270e/auth/oidc/callback'
+  loginSSO = (redirectUrl: string) => {
+    const ssoLogin = async (
+      req: NileRequest<unknown>
+    ): NileResponse<RestModels.TenantSSORegistration[]> => {
+      const headers = new Headers();
+      const body = await (req as Request).formData();
+      const accessToken = (await body.get('access_token')) as string;
+      const tenantId = (await body.get('tenantId')) as string;
+      const cookie = `${this.api?.cookieKey}=${accessToken}; path=/; samesite=lax; httponly;`;
+      headers.append('set-cookie', cookie);
+      headers.set(X_NILE_TENANT, tenantId);
+      headers.append('set-cookie', `tenantId=${tenantId}; path=/; httponly;`);
+      headers.set('Location', redirectUrl);
+      return new Response(null, {
+        headers,
+        status: 303,
+      });
+    };
+    return ssoLogin;
+  };
+
   loginSSOUrl = (provider: string) => {
     return `/workspaces/${encodeURIComponent(
       this.workspace