Merge branch 'main' into spalmurray/otherci-onboarding-refactor

.storybook/manager.ts

@@ -2,5 +2,5 @@ import { addons } from '@storybook/manager-api'
 import { themes } from '@storybook/theming'
 
 addons.setConfig({
-  theme: themes.dark,
+  theme: themes.light,
 })

.storybook/preview.tsx

@@ -19,7 +19,7 @@ export const decorators = [
 const preview: Preview = {
   parameters: {
     docs: {
-      theme: themes.dark,
+      theme: themes.light,
     },
   },
 }

src/App.spec.jsx → src/App.spec.tsx

@@ -2,6 +2,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { render, screen, waitFor } from '@testing-library/react'
 import { graphql, rest } from 'msw'
 import { setupServer } from 'msw/node'
+import React from 'react'
 import { MemoryRouter, Route } from 'react-router-dom'
 
 import config from 'config'
@@ -43,9 +44,9 @@ const internalUser = {
       integrationId: null,
       name: null,
       ownerid: 123,
-      service: 'github',
+      service: 'cool-service',
       stats: null,
-      username: 'codecov',
+      username: 'cool-guy',
     },
   ],
   termsAgreement: true,
@@ -73,9 +74,9 @@ const queryClient = new QueryClient({
 })
 
 const server = setupServer()
-let testLocation
+let testLocation: any
 const wrapper =
-  (initialEntries = []) =>
+  (initialEntries = ['']): React.FC<React.PropsWithChildren> =>
   ({ children }) =>
     (
       <QueryClientProvider client={queryClient}>
@@ -94,9 +95,10 @@ const wrapper =
 
 beforeAll(() => {
   server.listen({ onUnhandledRequest: 'warn' })
+  console.error = () => {}
 })
 
-afterEach(() => {
+beforeEach(() => {
   config.IS_SELF_HOSTED = false
   queryClient.clear()
   server.resetHandlers()
@@ -107,10 +109,20 @@ afterAll(() => {
 })
 
 describe('App', () => {
-  function setup(hasLoggedInUser = true) {
+  function setup({
+    hasLoggedInUser,
+    hasSession,
+  }: {
+    hasLoggedInUser?: boolean
+    hasSession?: boolean
+  }) {
     server.use(
       rest.get('/internal/user', (_, res, ctx) => {
-        return res(ctx.status(200), ctx.json(internalUser))
+        if (hasSession) {
+          return res(ctx.status(200), ctx.json(internalUser))
+        } else {
+          return res(ctx.status(200), ctx.json({}))
+        }
       }),
       graphql.query('DetailOwner', (_, res, ctx) =>
         res(ctx.status(200), ctx.data({ owner: 'codecov' }))
@@ -319,17 +331,18 @@ describe('App', () => {
     ({ testLabel, pathname, expected }) => {
       beforeEach(() => {
         config.IS_SELF_HOSTED = false
-        setup()
+        setup({ hasLoggedInUser: true, hasSession: true })
       })
 
       it(`renders the ${testLabel} page`, async () => {
         render(<App />, { wrapper: wrapper([pathname]) })
 
-        await waitFor(
-          () => expect(testLocation.pathname).toBe(expected.location),
-          expect(testLocation.search).toBe(expected.search)
+        await waitFor(() =>
+          expect(testLocation.pathname).toBe(expected.location)
         )
 
+        await waitFor(() => expect(testLocation.search).toBe(expected.search))
+
         const page = await screen.findByText(expected.page)
         expect(page).toBeInTheDocument()
       })
@@ -504,7 +517,7 @@ describe('App', () => {
     ({ testLabel, pathname, expected }) => {
       beforeEach(() => {
         config.IS_SELF_HOSTED = true
-        setup()
+        setup({ hasLoggedInUser: true, hasSession: true })
       })
 
       it(`renders the ${testLabel} page`, async () => {
@@ -521,9 +534,19 @@ describe('App', () => {
 
   describe('user not logged in', () => {
     it('redirects to login', async () => {
-      setup(false)
+      setup({ hasLoggedInUser: true, hasSession: false })
       render(<App />, { wrapper: wrapper(['*']) })
       await waitFor(() => expect(testLocation.pathname).toBe('/login'))
     })
   })
+  describe('user has session, not logged in', () => {
+    it('redirects to session default', async () => {
+      setup({ hasLoggedInUser: false, hasSession: true })
+
+      render(<App />, { wrapper: wrapper(['/blah']) })
+      await waitFor(() =>
+        expect(testLocation.pathname).toBe('/cool-service/cool-guy')
+      )
+    })
+  })
 })

src/App.jsx → src/App.tsx

@@ -13,7 +13,8 @@ import LoginLayout from 'layouts/LoginLayout'
 import { useLocationParams } from 'services/navigation'
 import { ToastNotificationProvider } from 'services/toastNotification'
 import { useUTM } from 'services/tracking/utm'
-import { useUser } from 'services/user'
+import { useInternalUser, useUser } from 'services/user'
+import { isProvider } from 'shared/api/helpers'
 
 const AccountSettings = lazy(() => import('./pages/AccountSettings'))
 const AdminSettings = lazy(() => import('./pages/AdminSettings'))
@@ -28,21 +29,32 @@ const PullRequestPage = lazy(() => import('./pages/PullRequestPage'))
 const RepoPage = lazy(() => import('./pages/RepoPage'))
 const SyncProviderPage = lazy(() => import('./pages/SyncProviderPage'))
 
+interface URLParams {
+  provider: string
+}
+
 const HomePageRedirect = () => {
-  const { provider } = useParams()
+  const { provider } = useParams<URLParams>()
   const { data: currentUser } = useUser()
+  const { data: internalUser } = useInternalUser({})
   const { params } = useLocationParams()
 
-  if (!provider || !currentUser) {
-    return <Redirect to="/login" />
+  let redirectURL = '/login'
+
+  if (internalUser && internalUser.owners) {
+    redirectURL = `/${internalUser.owners[0]?.service}/${internalUser.owners[0]?.username}`
   }
 
-  const defaultOrg =
-    currentUser.owner?.defaultOrgUsername ?? currentUser.user?.username
-  let redirectURL = `/${provider}/${defaultOrg}`
-  const { setup_action: setupAction } = params
-  if (setupAction) {
-    redirectURL += `?setup_action=${setupAction}`
+  if (provider && isProvider(provider) && currentUser) {
+    const defaultOrg =
+      currentUser.owner?.defaultOrgUsername ?? currentUser.user?.username
+    redirectURL = `/${provider}/${defaultOrg}`
+
+    // @ts-expect-error useLocationParams needs to be typed
+    const { setup_action: setupAction } = params
+    if (setupAction) {
+      redirectURL += `?setup_action=${setupAction}`
+    }
   }
 
   return <Redirect to={redirectURL} />
@@ -148,7 +160,7 @@ const MainAppRoutes = () => (
           <EnterpriseLandingPage />
         </EnterpriseLoginLayout>
       ) : (
-        <Redirect to="/login" />
+        <HomePageRedirect />
       )}
     </SentryRoute>
     <SentryRoute path="*">