zotan/megalodon
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #36 from h3poteto/types/public-get

Browse source 
Add generics type information for public get method
This commit is contained in:
AkiraFukushima 2019-04-07 18:48:48 +09:00 committed by GitHub
parent 9e40714049 285ea8bf2a
commit 410a8afa51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/mastodon.ts
View file

@ -104,8 +104,8 @@ export default class Mastodon implements MegalodonInstance {
}
if (options.website) params.website = options.website
return this._post('/api/v1/apps', params, baseUrl)
.then(data => OAuth.AppData.from(data as OAuth.AppDataFromServer))
return this._post<OAuth.AppDataFromServer>('/api/v1/apps', params, baseUrl)
.then((res: Response<OAuth.AppDataFromServer>) => OAuth.AppData.from(res.data))
}
/**
@ -154,13 +154,13 @@ export default class Mastodon implements MegalodonInstance {
baseUrl = DEFAULT_URL,
redirect_uri = NO_REDIRECT
): Promise<OAuth.TokenData> {
return this._post('/oauth/token', {
return this._post<OAuth.TokenDataFromServer>('/oauth/token', {
client_id,
client_secret,
code,
redirect_uri,
grant_type: 'authorization_code'
}, baseUrl).then(data => OAuth.TokenData.from(data as OAuth.TokenDataFromServer))
}, baseUrl).then((res: Response<OAuth.TokenDataFromServer>) => OAuth.TokenData.from(res.data))
}
/**
@ -178,12 +178,12 @@ export default class Mastodon implements MegalodonInstance {
refresh_token: string,
baseUrl = DEFAULT_URL
): Promise<OAuth.TokenData> {
return this._post('/oauth/token', {
return this._post<OAuth.TokenDataFromServer>('/oauth/token', {
client_id,
client_secret,
refresh_token,
grant_type: 'refresh_token'
}, baseUrl).then(data => OAuth.TokenData.from(data as OAuth.TokenDataFromServer))
}, baseUrl).then((res: Response<OAuth.TokenDataFromServer>) => OAuth.TokenData.from(res.data))
}
/**
@ -192,20 +192,36 @@ export default class Mastodon implements MegalodonInstance {
* @param params Query parameters
* @param baseUrl base URL of the target
*/
public static get(path: string, params = {}, baseUrl = DEFAULT_URL): Promise<object> {
public static get<T>(path: string, params = {}, baseUrl = DEFAULT_URL): Promise<Response<T>> {
const apiUrl = baseUrl
return axios
.get(apiUrl + path, {
.get<T>(apiUrl + path, {
params
})
.then(resp => resp.data)
.then((resp: AxiosResponse<T>) => {
const res: Response<T> = {
data: resp.data,
status: resp.status,
statusText: resp.statusText,
headers: resp.headers
}
return res
})
}
private static _post(path: string, params = {}, baseUrl = DEFAULT_URL): Promise<object> {
private static _post<T>(path: string, params = {}, baseUrl = DEFAULT_URL): Promise<Response<T>> {
const apiUrl = baseUrl
return axios
.post(apiUrl + path, params)
.then(resp => resp.data)
.post<T>(apiUrl + path, params)
.then((resp: AxiosResponse<T>) => {
const res: Response<T> = {
data: resp.data,
status: resp.status,
statusText: resp.statusText,
headers: resp.headers
}
return res
})
}
/**