Google認証とカレンダー連携 by yuto-trd · Pull Request #98 · NID-kt/web

yuto-trd · 2024-08-08T07:23:44Z

vercel · 2024-08-08T07:23:46Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
web	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 13, 2024 7:31pm

…wait

k-taro56

ありがとう！！ 😊😊😊😊😊
とってもたすかる！！

k-taro56 · 2024-08-11T16:03:15Z

src/db/adapter-pg.ts

+    async linkAccount(account) {
+      const exists = await client.query(
+        `SELECT EXISTS (
+        SELECT 1
+        FROM accounts
+        WHERE "userId" = $1 AND provider = $2 AND "providerAccountId" = $3
+      );`,
+        [account.userId, account.provider, account.providerAccountId],
+      );
+
+      let sql: string;
+      if (exists.rows[0].exists) {
+        sql = `
+          update accounts set
+            type = $3,
+            access_token = $5,
+            expires_at = $6,
+            refresh_token = $7,
+            id_token = $8,
+            scope = $9,
+            session_state = $10,
+            token_type = $11
+          where "userId" = $1 AND provider = $2 AND "providerAccountId" = $4
+          returning
+            id,
+            "userId", 
+            provider, 
+            type, 
+            "providerAccountId", 
+            access_token,
+            expires_at,
+            refresh_token,
+            id_token,
+            scope,
+            session_state,
+            token_type
+        `;
+      } else {
+        sql = `
+          insert into accounts 
+          (
+            "userId", 
+            provider, 
+            type, 
+            "providerAccountId", 
+            access_token,
+            expires_at,
+            refresh_token,
+            id_token,
+            scope,
+            session_state,
+            token_type
+          )
+          values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
+          returning
+            id,
+            "userId", 
+            provider, 
+            type, 
+            "providerAccountId", 
+            access_token,
+            expires_at,
+            refresh_token,
+            id_token,
+            scope,
+            session_state,
+            token_type
+          `;
+      }
+
+      const params = [
+        account.userId,
+        account.provider,
+        account.type,
+        account.providerAccountId,
+        account.access_token,
+        account.expires_at,
+        account.refresh_token,
+        account.id_token,
+        account.scope,
+        account.session_state,
+        account.token_type,
+      ];
+
+      const result = await client.query(sql, params);
+      return mapExpiresAt(result.rows[0]);
+    },


いらない予感？
これは next-auth のドキュメントがよくないよね

Suggested change

async linkAccount(account) {

const exists = await client.query(

`SELECT EXISTS (

SELECT 1

FROM accounts

WHERE "userId" = $1 AND provider = $2 AND "providerAccountId" = $3

);`,

[account.userId, account.provider, account.providerAccountId],

);

let sql: string;

if (exists.rows[0].exists) {

sql = `

update accounts set

type = $3,

access_token = $5,

expires_at = $6,

refresh_token = $7,

id_token = $8,

scope = $9,

session_state = $10,

token_type = $11

where "userId" = $1 AND provider = $2 AND "providerAccountId" = $4

returning

id,

"userId",

provider,

type,

"providerAccountId",

access_token,

expires_at,

refresh_token,

id_token,

scope,

session_state,

token_type

`;

} else {

sql = `

insert into accounts

(

"userId",

provider,

type,

"providerAccountId",

access_token,

expires_at,

refresh_token,

id_token,

scope,

session_state,

token_type

)

values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)

returning

id,

"userId",

provider,

type,

"providerAccountId",

access_token,

expires_at,

refresh_token,

id_token,

scope,

session_state,

token_type

`;

}

const params = [

account.userId,

account.provider,

account.type,

account.providerAccountId,

account.access_token,

account.expires_at,

account.refresh_token,

account.id_token,

account.scope,

account.session_state,

account.token_type,

];

const result = await client.query(sql, params);

return mapExpiresAt(result.rows[0]);

},

2回目以降のGoogleサインインでリフレッシュトークンを更新したいのでこんな感じになってます。
linkAccountじゃなくてもいいと思うけれども

k-taro56 · 2024-08-11T16:07:03Z

src/auth.ts

+      adapter.linkAccount?.({
+        ...account,
+        type: account.type as AdapterAccountType,
+        userId: adapterUser.id,
+      });


この前に来る段階で next-auth が自動的に呼び出している（はず）
これは next-auth のドキュメントがよくないよね

Suggested change

adapter.linkAccount?.({

...account,

type: account.type as AdapterAccountType,

userId: adapterUser.id,

});

2回目以降のGoogleサインインだとlinkAccountが呼び出されなかったので明示的に呼び出してます。

それは仕様なのよね

わかりにくいけど、そのプロバイダーで初めてログインしたときに作成された Accounts テーブルと、すでにあるかもしれない Users テーブルを結びつけるだけの操作なの（どちらのテーブルも linkAccount 呼び出し時には作成済み）
だから一度呼ばれるだけでいいのよ

next-auth のコードみたらわかるようにはなってる（ドキュメントなし）

src/auth.ts

k-taro56 · 2024-08-11T16:10:58Z

src/auth.ts

+            prompt: 'consent',
+            access_type: 'offline',
+            response_type: 'code',


DB あるし、わざわざ毎回リフレッシュトークン発行してもらう必要ないような
https://authjs.dev/getting-started/providers/google#:~:text=If%20you%20need%20access%20to%20the%20RefreshToken%20or%20AccessToken%20for%20a%20Google%20account%20and%20you%20are%20not%20using%20a%20database%20to%20persist%20user%20accounts%2C%20this%20may%20be%20something%20you%20need%20to%20do.

Google only provides Refresh Token to an application the first time a user signs in.

って書いてるけど、この設定がないとRefresh Tokenが渡されなかった

https://developers.google.com/identity/openid-connect/openid-connect?hl=ja#exchangecode

refresh_token
（省略可）
このフィールドは、認証リクエストでaccess_type パラメータが offline に設定されている場合にのみ表示されます。詳しくは、更新トークンをご覧ください。

DB あるし、わざわざ毎回リフレッシュトークン発行してもらう必要ないような https://authjs.dev/getting-started/providers/google#:~:text=If%20you%20need%20access%20to%20the%20RefreshToken%20or%20AccessToken%20for%20a%20Google%20account%20and%20you%20are%20not%20using%20a%20database%20to%20persist%20user%20accounts%2C%20this%20may%20be%20something%20you%20need%20to%20do.

nidkt.orgのサインインにGoogleを使うんだったら、リフレッシュトークンの発行は最初だけでいいと思うけど、
Googleサインインはユーザーがカレンダーをリンクしたい時とリンク先のアカウントを変更したい時に使われるだけなのでこれで良いと思ってる

src/utils/calendar/types.ts

k-taro56 · 2024-08-11T17:04:31Z

src/utils/calendar/mapping.ts

ほりゅう 🐉

k-taro56 · 2024-08-11T17:04:53Z

src/utils/calendar/recurrenceUtil.ts

ほりゅう 🐉

src/utils/calendar/calendarService.ts

src/utils/calendar/mapping.ts

Co-authored-by: Kawahara Shotaro <121674121+k-taro56@users.noreply.github.com>

…to updateAccount

yuto-trd mentioned this pull request Aug 8, 2024

カレンダー連携 NID-kt/bot-worker#77

Open

vercel bot deployed to Preview August 8, 2024 08:00 View deployment

vercel bot deployed to Preview August 8, 2024 08:10 View deployment

k-taro56 assigned yuto-trd Aug 8, 2024

vercel bot deployed to Preview August 9, 2024 07:04 View deployment

vercel bot deployed to Preview August 9, 2024 09:18 View deployment

vercel bot deployed to Preview August 9, 2024 09:20 View deployment

vercel bot deployed to Preview August 9, 2024 10:15 View deployment

yuto-trd marked this pull request as ready for review August 9, 2024 10:35

yuto-trd requested a review from k-taro56 August 9, 2024 10:35

yuto-trd added 13 commits August 9, 2024 23:29

add: 'Sign in with Google'

b25b705

feat: Persistent refresh token

25c8eb0

feat: override linkAccount to update when account exists

649400c

chore: Add Google authentication credentials to .env.local.sample

cc79a8d

feat: Add Google Calendar integration for Google sign-in users

b08af05

fix: typo

a368384

feat: Update linkCalendar and unlinkCalendar functions to use async/a…

4cb3ec2

…wait

fix: Add redirect after linking/unlinking calendar

02a918a

feat: introduce vercel/postgres

4863e6e

feat: Add Discord API dependencies

a8203cf

feat: Synchronize events when calendar link settings are changed.

b610634

refactor: index.ts

ae2a9cb

fix: recurrenceUtil.ts

1f7a78b

yuto-trd force-pushed the link-calender branch from d3ef74c to 1f7a78b Compare August 9, 2024 14:31

vercel bot deployed to Preview August 9, 2024 14:32 View deployment

k-taro56 reviewed Aug 11, 2024

View reviewed changes

yuto-trd and others added 2 commits August 12, 2024 03:54

Update src/utils/calendar/recurrenceUtil.ts

b1a2a11

Co-authored-by: Kawahara Shotaro <121674121+k-taro56@users.noreply.github.com>

Update src/utils/calendar/types.ts

8e8c21b

Co-authored-by: Kawahara Shotaro <121674121+k-taro56@users.noreply.github.com>

vercel bot deployed to Preview August 11, 2024 18:55 View deployment

Update src/auth.ts

4fbc21d

Co-authored-by: Kawahara Shotaro <121674121+k-taro56@users.noreply.github.com>

vercel bot deployed to Preview August 13, 2024 09:25 View deployment

yuto-trd added 2 commits August 13, 2024 19:03

feat: Added Google Calendar API request body type

54062ae

chore: Add description to biome-ignore

6ca6ea9

vercel bot deployed to Preview August 13, 2024 10:06 View deployment

yuto-trd added 3 commits August 14, 2024 04:23

chore: rename linkAccount function called at "Update Google Profile" …

778b6ef

…to updateAccount

feat: Delete refresh token from db when it is invalid

1a10f49

feat: Show calendar link errors

0350ad8

vercel bot deployed to Preview August 13, 2024 19:31 View deployment

Conversation

yuto-trd commented Aug 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vercel bot commented Aug 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k-taro56 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as off-topic.

Uh oh!

yuto-trd Aug 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yuto-trd Aug 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

yuto-trd commented Aug 8, 2024 •

edited

Loading

vercel bot commented Aug 8, 2024 •

edited

Loading

yuto-trd Aug 13, 2024 •

edited

Loading

yuto-trd Aug 13, 2024 •

edited

Loading