Update /api/twitter-auth-info to add user info

pages/api/twitter-auth-info.ts

@@ -4,14 +4,6 @@ import { request } from "../../utils/url";
 import { ironOptions } from "../../iron.config";
 import { twitterApiBaseUrl } from "../../constants/twitter";
 
-interface TwitterOAuth2TokenData {
-  token_type: string;
-  expires_in: number;
-  access_token: string;
-  scope: string;
-  refresh_token: string;
-}
-
 export default withIronSessionApiRoute(async function handler(
   req: NextApiRequest,
   res: NextApiResponse,
@@ -43,21 +35,31 @@ export default withIronSessionApiRoute(async function handler(
     params.append("code", code as string);
     params.append("redirect_uri", process.env.TWITTER_AUTH_CALLBACK_URI);
     params.append("code_verifier", req.session.code_verifier);
-    const tokenData = await request<TwitterOAuth2TokenData>(
+    const { access_token: accessToken } =
-      `${twitterApiBaseUrl}/oauth2/token`,
+      await request<TwitterOAuth2TokenResponse>(
-      {
+        `${twitterApiBaseUrl}/oauth2/token`,
-        method: "post",
+        {
-        headers: {
+          method: "post",
-          "Content-Type": "application/x-www-form-urlencoded",
+          headers: {
-          Authorization: `Basic ${Buffer.from(
+            "Content-Type": "application/x-www-form-urlencoded",
-            `${process.env.TWITTER_CLIENT_ID}:${process.env.TWITTER_CLIENT_SECRET}`,
+            Authorization: `Basic ${Buffer.from(
-          ).toString("base64")}`,
+              `${process.env.TWITTER_CLIENT_ID}:${process.env.TWITTER_CLIENT_SECRET}`,
+            ).toString("base64")}`,
+          },
+          body: params,
         },
-        body: params,
+      );
+    const {
+      data: { id, username },
+    } = await request<TwitterUsersMeResponse>(`${twitterApiBaseUrl}/users/me`, {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
       },
-    );
+    });
     res.status(200).json({
-      accessToken: tokenData.access_token,
+      accessToken,
+      id,
+      username,
     });
   } catch (error) {
     console.log(error);
@@ -65,3 +67,19 @@ export default withIronSessionApiRoute(async function handler(
   }
 },
 ironOptions);
+
+interface TwitterOAuth2TokenResponse {
+  token_type: string;
+  expires_in: number;
+  access_token: string;
+  scope: string;
+  refresh_token: string;
+}
+
+interface TwitterUsersMeResponse {
+  data: {
+    id: string;
+    username: string;
+    name: string;
+  };
+}

pages/verification/index.tsx

@@ -2,14 +2,15 @@ import { useEffect, useState } from "react";
 import { TwitterAuthInfoResponse } from "../../types/api-response";
 
 export default function VerificationPage() {
-  const [accessToken, setAccessToken] = useState<string>();
+  const [twitterAuthInfo, setTwitterAuthInfo] =
+    useState<TwitterAuthInfoResponse | null>();
 
   const fetchAccessToken = async (state: string, code: string) => {
-    const { accessToken }: TwitterAuthInfoResponse = await (
+    const newTwitterAuthInfo: TwitterAuthInfoResponse = await (
-      await fetch(`/api/auth/access-token?state=${state}&code=${code}`)
+      await fetch(`/api/twitter-auth-info?state=${state}&code=${code}`)
     ).json();
 
-    setAccessToken(accessToken);
+    setTwitterAuthInfo(newTwitterAuthInfo);
   };
 
   useEffect(() => {
@@ -23,7 +24,7 @@ export default function VerificationPage() {
 
   return (
     <div>
-      <div>{accessToken}</div>
+      <div>{twitterAuthInfo?.username}</div>
     </div>
   );
 }

types/api-response.ts

@@ -4,4 +4,6 @@ export interface TwitterAuthUrlResponse {
 
 export interface TwitterAuthInfoResponse {
   accessToken: string;
+  id: string;
+  username: string;
 }