Use Arctic for OAuth providers

waspc/data/Generator/templates/react-app/src/auth/pages/OAuthCallback.tsx

@@ -0,0 +1,132 @@
+{{={= =}=}}
+import { useEffect, useRef, useState } from "react";
+import { type AxiosResponse } from "axios";
+import { Redirect, useLocation } from 'react-router-dom'
+import { useAuth } from 'wasp/client/auth'
+import { api } from 'wasp/client/api'
+import { initSession } from 'wasp/auth/helpers/user'
+
+const wrapperStyles = {
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "center",
+  padding: "4rem",
+};
+
+const commonMessageStyles = {
+  display: 'flex',
+  alignItems: 'center',
+  gap: '.5rem',
+  borderRadius: '.5rem',
+  padding: '1rem',
+};
+
+const errorMessageStyles = {
+  ...commonMessageStyles,
+  borderColor: 'rgb(240 82 82)',
+  backgroundColor: 'rgb(253 232 232)',
+  color: 'rgb(200 30 30)',
+};
+
+const loadingMessageStyles = {
+  ...commonMessageStyles,
+  borderColor: 'rgb(107 114 128)',
+  backgroundColor: 'rgb(243 244 246)',
+  color: 'rgb(55 65 81)',
+};
+
+export function OAuthCallbackPage() {
+  const { isLoading, error, user } = useOAuthCallbackHandler();
+
+  if (user !== undefined && user !== null) {
+    return <Redirect to="{= onAuthSucceededRedirectTo =}" />;
+  }
+
+  return (
+    <div style={wrapperStyles}>
+      {error && <div style={errorMessageStyles}><MessageIcon /> {error}</div>}
+      {isLoading && <div style={loadingMessageStyles}><MessageIcon /> Please wait a moment while we log you in.</div>}
+    </div>
+  );
+}
+
+function useOAuthCallbackHandler() {
+  const { data: user } = useAuth();
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const location = useLocation();
+
+  async function handleCallback() {
+    try {
+      setIsLoading(true);
+      const query = new URLSearchParams(location.search);
+
+      // If we got redirect with an error, display it to the user
+      // and don't continue with the login process.
+      const errorFromRedirect = query.get('error');
+      if (errorFromRedirect !== null) {
+        setError(errorFromRedirect);
+        return;
+      }
+
+      const code = location.hash.slice(1);
+      const response = await exchangeOAuthCodeForToken({ code });
+      if (!isResponseWithSessionId(response)) {
+        setError("Unable to login with the OAuth provider.");
+        return;
+      }
+      await initSession(response.data.sessionId);
+    } catch (e: unknown) {
+      console.error(e);
+      setError("Unable to login with the OAuth provider.");
+    } finally {
+      setIsLoading(false);
+    }
+  }
+
+  const isFirstRender = useRef(true);
+  useEffect(() => {
+    if (isFirstRender.current) {
+      isFirstRender.current = false;
+      handleCallback();
+    }
+  }, []);
+
+  return {
+    user,
+    error,
+    isLoading,
+  };
+}
+
+const MessageIcon = () => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="1.25rem"
+    height="1.25rem"
+    fill="currentColor"
+    stroke="currentColor"
+    strokeWidth={0}
+    aria-hidden="true"
+    viewBox="0 0 20 20"
+  >
+    <path
+      fillRule="evenodd"
+      stroke="none"
+      d="M18 10a8 8 0 1 1-16 0 8 8 0 0 1 16 0zm-7-4a1 1 0 1 1-2 0 1 1 0 0 1 2 0zM9 9a1 1 0 0 0 0 2v3a1 1 0 0 0 1 1h1a1 1 0 1 0 0-2v-3a1 1 0 0 0-1-1H9z"
+      clipRule="evenodd"
+    />
+  </svg>
+)
+
+async function exchangeOAuthCodeForToken(data: {
+  code: string
+}): Promise<AxiosResponse<unknown>> {
+  return api.post('/auth/exchange-code', data)
+}
+
+function isResponseWithSessionId(
+  response: AxiosResponse<unknown>
+): response is AxiosResponse<{ sessionId: string }> {
+  return response.data && typeof (response.data as any).sessionId === 'string'
+}

waspc/data/Generator/templates/react-app/src/router.tsx

@@ -14,7 +14,7 @@ import createAuthRequiredPage from "./auth/pages/createAuthRequiredPage"
 {=/ pagesToImport =}
 
 {=# isExternalAuthEnabled =}
-import OAuthCodeExchange from "./auth/pages/OAuthCodeExchange"
+import { OAuthCallbackPage } from "./auth/pages/OAuthCallback"
 {=/ isExternalAuthEnabled =}
 
 import { routes } from 'wasp/client/router'
@@ -40,13 +40,9 @@ const router = (
         />
       ))}
       {=# isExternalAuthEnabled =}
-      {=# externalAuthProviders =}
-      {=# authProviderEnabled =}
-      <Route exact path="{= authFrontendUrl =}">
-        <OAuthCodeExchange pathToApiServerRouteHandlingOauthRedirect="{= authServerOauthRedirectUrl =}" />
+      <Route exact path="{= oAuthCallbackPath =}">
+        <OAuthCallbackPage />
       </Route>
-      {=/ authProviderEnabled =}
-      {=/ externalAuthProviders =}
       {=/ isExternalAuthEnabled =}
     </Switch>
     {=# rootComponent.isDefined =}

waspc/data/Generator/templates/sdk/wasp/auth/providers/types.ts

@@ -16,19 +16,11 @@ export type ProviderConfig = {
     // Unique provider identifier, used as part of URL paths
     id: ProviderName;
     displayName: string;
-    // Each provider config can have an init method which is ran on setup time
-    // e.g. for oAuth providers this is the time when the Passport strategy is registered.
-    init?(provider: ProviderConfig): Promise<InitData>;
     // Every provider must have a setupRouter method which returns the Express router.
     // In this function we are flexibile to do what ever is necessary to make the provider work.
-    createRouter(provider: ProviderConfig, initData: InitData): Router;
+    createRouter(provider: ProviderConfig): Router;
 };
 
-// PRIVATE API
-export type InitData = {
-    [key: string]: any;
-}
-
 // PRIVATE API
 export type RequestWithWasp = Request & { wasp?: { [key: string]: any } }
 

waspc/data/Generator/templates/sdk/wasp/server/utils.ts

@@ -1,11 +1,6 @@
 {{={= =}=}}
-import crypto from 'crypto'
 import { Request, Response, NextFunction } from 'express'
 
-import { readdir } from 'fs'
-import { dirname } from 'path'
-import { fileURLToPath } from 'url'
-
 {=# isAuthEnabled =}
 import { type AuthUser } from 'wasp/auth'
 {=/ isAuthEnabled =}
@@ -40,3 +35,10 @@ async (req: RequestWithExtraFields, res: Response, next: NextFunction) => {
 }
 
 export const sleep = (ms: number): Promise<unknown> => new Promise((r) => setTimeout(r, ms))
+
+export function redirect(res: Response, redirectUri: string)  {
+  return res
+    .status(302)
+    .setHeader("Location", redirectUri)
+    .end();
+}