Merge remote-tracking branch 'origin/main'

apps/backend/src/services/auth/providers/oauth.provider.ts

@@ -60,7 +60,7 @@ export class OauthProvider implements ProvidersInterface {
   }
 
   async getToken(code: string): Promise<string> {
-    const response = await fetch(`${this.tokenUrl}/`, {
+    const response = await fetch(`${this.tokenUrl}`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded',
@@ -85,7 +85,7 @@ export class OauthProvider implements ProvidersInterface {
   }
 
   async getUser(access_token: string): Promise<{ email: string; id: string }> {
-    const response = await fetch(`${this.userInfoUrl}/`, {
+    const response = await fetch(`${this.userInfoUrl}`, {
       headers: {
         Authorization: `Bearer ${access_token}`,
         Accept: 'application/json',

apps/frontend/src/components/auth/register.tsx

@@ -14,6 +14,7 @@ import { LoadingComponent } from '@gitroom/frontend/components/layout/loading';
 import interClass from '@gitroom/react/helpers/inter.font';
 import clsx from 'clsx';
 import { GoogleProvider } from '@gitroom/frontend/components/auth/providers/google.provider';
+import { OauthProvider } from '@gitroom/frontend/components/auth/providers/oauth.provider';
 import { useFireEvents } from '@gitroom/helpers/utils/use.fire.events';
 import { useVariables } from '@gitroom/react/helpers/variable.context';
 import { useTrack } from '@gitroom/react/helpers/use.track';
@@ -91,7 +92,8 @@ export function RegisterAfter({
   token: string;
   provider: string;
 }) {
-  const { isGeneral, neynarClientId, billingEnabled } = useVariables();
+  const { isGeneral, genericOauth, neynarClientId, billingEnabled } =
+    useVariables();
   const [loading, setLoading] = useState(false);
   const router = useRouter();
   const fireEvents = useFireEvents();
@@ -163,7 +165,11 @@ export function RegisterAfter({
             <GithubProvider />
           ) : (
             <div className="gap-[5px] flex flex-col">
-              <GoogleProvider />
+              {genericOauth && isGeneral ? (
+                <OauthProvider />
+              ) : (
+                <GoogleProvider />
+              )}
               {!!neynarClientId && <FarcasterProvider />}
               {billingEnabled && <WalletProvider />}
             </div>