Skip to content

Commit

Permalink
twitter refresh token
Browse files Browse the repository at this point in the history
  • Loading branch information
@amay077
amay077 committed May 6, 2024
1 parent 7acda5a commit 7fc8f09
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/lib/BlueSkyConnection.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@
<div class="d-flex flex-column gap-1">
<span>1.ユーザーIDとアプリパスワードを入力</span>
<div class="d-flex flex-row gap-1">
<input class="form-control form-control-sm" type="text" bind:value={user}>
<input class="form-control form-control-sm" placeholder="Identifier(e.g. e-mail)" type="text" bind:value={user}>
</div>
<div class="d-flex flex-row gap-1">
<input class="form-control form-control-sm" type="password" bind:value={password}>
<input class="form-control form-control-sm" type="password" placeholder="App Password" bind:value={password}>
<button class="btn btn-sm btn-primary" disabled={user?.length <= 0 || password?.length <= 0} style="width: 60px;" on:click={onApplyBSkySettings}>接続</button>
</div>
</div>
Expand Down
14 changes: 9 additions & 5 deletions src/lib/MainContent.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
if (res.ok) {
const data = await res.json();
postSettings.twitter = { type: 'twitter', title: 'Twitter', enabled: true, access_token_response: data };
postSettings.twitter = { type: 'twitter', title: 'Twitter', enabled: true, access_token_response: { refresh_token: data.refresh_token } };
savePostSetting(postSettings.twitter);
postTo.twitter = true;
alert('Twitter に接続しました。');
Expand Down Expand Up @@ -229,17 +229,21 @@
const postToTwritter = async (text: string): Promise<boolean> => {
try {
const settings = postSettings.twitter!;
const ACCESS_TOKEN = settings.access_token_response.access_token;
const refresh_token = settings.access_token_response.refresh_token;
const res = await fetch(`${Config.API_ENDPOINT}/twitter_post`, {
method: 'POST',
headers: {
'Content-Type': 'text/plain',
},
body: JSON.stringify({ access_token: ACCESS_TOKEN, text }),
body: JSON.stringify({ refresh_token, text }),
});
if (res.ok) {
const resJson = await res.json();
console.log(`FIXME h_oku 後で消す -> postToTwritter -> resJson:`, resJson);
settings.access_token_response.refresh_token = resJson.refresh_token;
savePostSetting(settings);
} else {
return false;
}
Expand Down Expand Up @@ -311,15 +315,15 @@
<button class="share_button" on:click="{() => post(x)}" disabled={posting || Array.from(Object.values(postTo)).every(x => !x)}>
<div class="d-flex flex-row align-items-center gap-1">
{#if postSettings.mastodon != null && postTo.mastodon}
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-mastodon" viewBox="0 0 16 16">
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" class="bi bi-mastodon" viewBox="0 0 16 16">
<path d="M11.19 12.195c2.016-.24 3.77-1.475 3.99-2.603.348-1.778.32-4.339.32-4.339 0-3.47-2.286-4.488-2.286-4.488C12.062.238 10.083.017 8.027 0h-.05C5.92.017 3.942.238 2.79.765c0 0-2.285 1.017-2.285 4.488l-.002.662c-.004.64-.007 1.35.011 2.091.083 3.394.626 6.74 3.78 7.57 1.454.383 2.703.463 3.709.408 1.823-.1 2.847-.647 2.847-.647l-.06-1.317s-1.303.41-2.767.36c-1.45-.05-2.98-.156-3.215-1.928a3.614 3.614 0 0 1-.033-.496s1.424.346 3.228.428c1.103.05 2.137-.064 3.188-.189zm1.613-2.47H11.13v-4.08c0-.859-.364-1.295-1.091-1.295-.804 0-1.207.517-1.207 1.541v2.233H7.168V5.89c0-1.024-.403-1.541-1.207-1.541-.727 0-1.091.436-1.091 1.296v4.079H3.197V5.522c0-.859.22-1.541.66-2.046.456-.505 1.052-.764 1.793-.764.856 0 1.504.328 1.933.983L8 4.39l.417-.695c.429-.655 1.077-.983 1.934-.983.74 0 1.336.259 1.791.764.442.505.661 1.187.661 2.046v4.203z"/>
</svg>
{/if}
{#if postSettings.bluesky != null && postTo.bluesky}
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -3.268 64 68.414" width="16" height="16"><path fill="currentColor" d="M13.873 3.805C21.21 9.332 29.103 20.537 32 26.55v15.882c0-.338-.13.044-.41.867-1.512 4.456-7.418 21.847-20.923 7.944-7.111-7.32-3.819-14.64 9.125-16.85-7.405 1.264-15.73-.825-18.014-9.015C1.12 23.022 0 8.51 0 6.55 0-3.268 8.579-.182 13.873 3.805zm36.254 0C42.79 9.332 34.897 20.537 32 26.55v15.882c0-.338.13.044.41.867 1.512 4.456 7.418 21.847 20.923 7.944 7.111-7.32 3.819-14.64-9.125-16.85 7.405 1.264 15.73-.825 18.014-9.015C62.88 23.022 64 8.51 64 6.55c0-9.818-8.578-6.732-13.873-2.745z"/></svg>
{/if}
{#if postSettings.twitter != null && postTo.twitter}
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-twitter" viewBox="0 0 16 16">
<svg style="margin-top: -2px;" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-twitter" viewBox="0 0 16 16">
<path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"/>
</svg>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/TwitterConnection.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
const onConnectToTwitter = () => {
const url = `https://twitter.com/i/oauth2/authorize?response_type=code&client_id=${Config.post_targets.twitter.client_id}&redirect_uri=${Config.post_targets.twitter.redirect_uri}&scope=tweet.read%20tweet.write%20users.read&state=twitter_callback&code_challenge=challenge&code_challenge_method=plain`;
const url = `https://twitter.com/i/oauth2/authorize?response_type=code&client_id=${Config.post_targets.twitter.client_id}&redirect_uri=${Config.post_targets.twitter.redirect_uri}&scope=tweet.read%20tweet.write%20users.read%20offline.access&state=twitter_callback&code_challenge=challenge&code_challenge_method=plain`;
// url をこのタブで開く
window.open(url, '_self');
Expand Down
4 changes: 0 additions & 4 deletions src/lib/func.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ export type SettingDataTwitter = {
title: 'Twitter',
enabled: boolean,
access_token_response: {
token_type: string,
expires_in: number,
access_token: string,
refresh_token: string,
scope: string,
}
};

Expand Down

0 comments on commit 7fc8f09

Please sign in to comment.