Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
mirror of https://github.com/h3poteto/whalebird-desktop synced 2025-02-01 01:47:01 +01:00
Code Issues Releases Wiki Activity

refs #859 Add update access token method using refresh token

Browse Source
This commit is contained in:
AkiraFukushima 2019-05-22 22:12:19 +09:00
parent 9dd8ce0bbf
commit b547e09b93
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/auth.ts
View File

@ -1,4 +1,4 @@
import Mastodon from 'megalodon' import Mastodon, { OAuth } from 'megalodon'
import Account from './account' import Account from './account'
import LocalAccount from '~/src/types/localAccount' import LocalAccount from '~/src/types/localAccount'
@ -14,7 +14,7 @@ export default class Authentication {
private clientSecret: string private clientSecret: string
private protocol: 'http' | 'https' private protocol: 'http' | 'https'
constructor (accountDB: Account) { constructor(accountDB: Account) {
this.db = accountDB this.db = accountDB
this.baseURL = '' this.baseURL = ''
this.domain = '' this.domain = ''
@ -23,17 +23,18 @@ export default class Authentication {
this.protocol = 'https' this.protocol = 'https'
} }
setOtherInstance (domain: string) { setOtherInstance(domain: string) {
this.baseURL = `${this.protocol}://${domain}` this.baseURL = `${this.protocol}://${domain}`
this.domain = domain this.domain = domain
this.clientId = '' this.clientId = ''
this.clientSecret = '' this.clientSecret = ''
} }
async getAuthorizationUrl (domain = 'mastodon.social'): Promise<string> { async getAuthorizationUrl(domain = 'mastodon.social'): Promise<string> {
this.setOtherInstance(domain) this.setOtherInstance(domain)
const res = await Mastodon.registerApp( const res = await Mastodon.registerApp(
appName, { appName,
{
scopes: scope, scopes: scope,
website: appURL website: appURL
}, },
@ -42,9 +43,10 @@ export default class Authentication {
this.clientId = res.clientId this.clientId = res.clientId
this.clientSecret = res.clientSecret this.clientSecret = res.clientSecret
const order = await this.db.lastAccount() const order = await this.db
.lastAccount()
.then(account => account.order + 1) .then(account => account.order + 1)
.catch((err) => { .catch(err => {
console.log(err) console.log(err)
return 1 return 1
}) })
@ -67,8 +69,8 @@ export default class Authentication {
return res.url return res.url
} }
async getAccessToken (code: string): Promise<string> { async getAccessToken(code: string): Promise<string> {
const tokenData = await Mastodon.fetchAccessToken(this.clientId, this.clientSecret, code, this.baseURL) const tokenData: OAuth.TokenData = await Mastodon.fetchAccessToken(this.clientId, this.clientSecret, code, this.baseURL)
const search = { const search = {
baseURL: this.baseURL, baseURL: this.baseURL,
domain: this.domain, domain: this.domain,
@ -88,7 +90,20 @@ export default class Authentication {
}) })
return accessToken return accessToken
} }
// TODO: Refresh access token when expired
async updateAccessToken(id: string): Promise<string> {
const account = await this.db.getAccount(id)
if (!account.refreshToken) {
throw new RefreshTokenDoesNotExist()
}
const data: OAuth.TokenData = await Mastodon.refreshToken(account.clientId, account.clientSecret, account.refreshToken, account.baseURL)
await this.db.updateAccount(id, {
accessToken: data.access_token,
refreshToken: data.refresh_token
})
return data.access_token
}
} }
class AuthenticationURLError extends Error {} class AuthenticationURLError extends Error {}
class RefreshTokenDoesNotExist extends Error {}