Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

refs #317 Use forked repository for mastodon-api, and set website url when register application

This commit is contained in:
AkiraFukushima 2018-05-19 16:41:44 +09:00
parent 9b628eb504
commit 07cddf48b9
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package-lock.json generated
View File

@ -7583,7 +7583,7 @@
"resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz",
"integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==",
"requires": { "requires": {
"sparkles": "1.0.0" "sparkles": "1.0.1"
} }
}, },
"got": { "got": {
@ -7757,7 +7757,7 @@
}, },
"onetime": { "onetime": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
}, },
"pluralize": { "pluralize": {
@ -8070,7 +8070,7 @@
"resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
"integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
"requires": { "requires": {
"sparkles": "1.0.0" "sparkles": "1.0.1"
} }
}, },
"has-unicode": { "has-unicode": {
@ -10593,9 +10593,7 @@
} }
}, },
"mastodon-api": { "mastodon-api": {
"version": "1.3.0", "version": "github:h3poteto/mastodon-api#c567f019c8f1ffa19b21d73be183c9ceedac4d78",
"resolved": "https://registry.npmjs.org/mastodon-api/-/mastodon-api-1.3.0.tgz",
"integrity": "sha1-s7z/z1HgBfdUt+huRMICPY4sY9E=",
"requires": { "requires": {
"gulp-eslint": "3.0.1", "gulp-eslint": "3.0.1",
"mime": "1.6.0", "mime": "1.6.0",
@ -15005,9 +15003,9 @@
"dev": true "dev": true
}, },
"sparkles": { "sparkles": {
"version": "1.0.0", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
"integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=" "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="
}, },
"spdx-correct": { "spdx-correct": {
"version": "3.0.0", "version": "3.0.0",

2
package.json
View File

@ -95,7 +95,7 @@
"hawk": "^7.0.7", "hawk": "^7.0.7",
"hoek": "^5.0.3", "hoek": "^5.0.3",
"is-empty": "^1.2.0", "is-empty": "^1.2.0",
"mastodon-api": "^1.3.0", "mastodon-api": "github:h3poteto/mastodon-api#lib",
"moment": "^2.21.0", "moment": "^2.21.0",
"nedb": "^1.8.0", "nedb": "^1.8.0",
"object-assign-deep": "^0.4.0", "object-assign-deep": "^0.4.0",

10
src/main/auth.js
View File

@ -1,6 +1,7 @@
import Mastodon from 'mastodon-api' import Mastodon from 'mastodon-api'
const appName = 'Whalebird' const appName = 'Whalebird'
const appURL = 'https://whalebird.org'
const scope = 'read write follow' const scope = 'read write follow'
export default class Authentication { export default class Authentication {
@ -22,8 +23,13 @@ export default class Authentication {
async getAuthorizationUrl (domain = 'mastodon.social') { async getAuthorizationUrl (domain = 'mastodon.social') {
this.setOtherInstance(domain) this.setOtherInstance(domain)
// Waiting for merge this pull request: https://github.com/vanita5/mastodon-api/pull/8 const res = await Mastodon.createOAuthApp(
const res = await Mastodon.createOAuthApp(this.baseURL + '/api/v1/apps', appName, scope) this.baseURL + '/api/v1/apps',
appName,
scope,
'urn:ietf:wg:oauth:2.0:oob',
appURL
)
this.clientId = res.client_id this.clientId = res.client_id
this.clientSecret = res.client_secret this.clientSecret = res.client_secret