From 159024a1962640bf8deb127196cf688aed95f2fc Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@coder.com>
Date: Mon, 25 Apr 2022 17:07:10 -0500
Subject: [PATCH] fix: Add redirect for OAuth from /login (#1163)

This allows for a complete sign-up flow:
1. coder login https://dev.coder.com
2. Navigates to /cli-auth
3. Redirects to /login?redirect=%2Fcli-auth
4. User signs in with GitHub
5. User is redirected back to /cli-auth
---
 site/src/AppRouter.tsx                        | 9 ++++++++-
 site/src/components/SignInForm/SignInForm.tsx | 4 +++-
 site/src/pages/LoginPage/LoginPage.tsx        | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
index 3f302956a0..4016b010d2 100644
--- a/site/src/AppRouter.tsx
+++ b/site/src/AppRouter.tsx
@@ -34,7 +34,14 @@ export const AppRouter: React.FC = () => (
 
       <Route path="login" element={<LoginPage />} />
       <Route path="healthz" element={<HealthzPage />} />
-      <Route path="cli-auth" element={<CliAuthenticationPage />} />
+      <Route
+        path="cli-auth"
+        element={
+          <RequireAuth>
+            <CliAuthenticationPage />
+          </RequireAuth>
+        }
+      />
 
       <Route path="templates">
         <Route
diff --git a/site/src/components/SignInForm/SignInForm.tsx b/site/src/components/SignInForm/SignInForm.tsx
index 38e32b41a4..ab528ebf94 100644
--- a/site/src/components/SignInForm/SignInForm.tsx
+++ b/site/src/components/SignInForm/SignInForm.tsx
@@ -53,6 +53,7 @@ const useStyles = makeStyles((theme) => ({
 
 export interface SignInFormProps {
   isLoading: boolean
+  redirectTo: string
   authErrorMessage?: string
   methodsErrorMessage?: string
   authMethods?: AuthMethods
@@ -61,6 +62,7 @@ export interface SignInFormProps {
 
 export const SignInForm: React.FC<SignInFormProps> = ({
   authMethods,
+  redirectTo,
   isLoading,
   authErrorMessage,
   methodsErrorMessage,
@@ -113,7 +115,7 @@ export const SignInForm: React.FC<SignInFormProps> = ({
       </form>
       {authMethods?.github && (
         <div className={styles.submitBtn}>
-          <Link href="/api/v2/users/oauth2/github/callback">
+          <Link href={`/api/v2/users/oauth2/github/callback?redirect=${encodeURIComponent(redirectTo)}`}>
             <Button color="primary" disabled={isLoading} fullWidth type="submit" variant="contained">
               {Language.githubSignIn}
             </Button>
diff --git a/site/src/pages/LoginPage/LoginPage.tsx b/site/src/pages/LoginPage/LoginPage.tsx
index 75f9f6d8a0..531329078c 100644
--- a/site/src/pages/LoginPage/LoginPage.tsx
+++ b/site/src/pages/LoginPage/LoginPage.tsx
@@ -52,6 +52,7 @@ export const LoginPage: React.FC = () => {
           <div className={styles.container}>
             <SignInForm
               authMethods={authState.context.methods}
+              redirectTo={redirectTo}
               isLoading={isLoading}
               authErrorMessage={authErrorMessage}
               methodsErrorMessage={getMethodsError}