only resolve url in getAuthorizationUrl,

fix function parameters, update authorization example
vanita5 · Apr 7, 2017 · 855f1d4 · 855f1d4
1 parent 60c49c1
commit 855f1d4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ Optional. Defines the scopes of your OAuth app whitespace seperated. Defaults to
 
 Optional. Defaults to `urn:ietf:wg:oauth:2.0:oob`. This will be used in a future call to `Mastodon.getAuthorizationUrl(...)`, only the URL defined here can be used later to redirect the user. The default means no redirect (the code will be shown to the user).
 
-## `Mastodon.getAuthorizationUrl(clientId, clientSecret, { baseUrl, scope, redirectUri })`
+## `Mastodon.getAuthorizationUrl(clientId, clientSecret, baseUrl, scope, redirectUri)`
 Returns an authorization url for users to authorize your application.
 `clientId` and `clientSecret` can be obtained by calling `Mastodon.createOAuthApp(...)` before.
 
@@ -68,7 +68,7 @@ Your `client_secret`.
 
 Optional. Defaults to `https://mastodon.social`.
 
-**scopes**
+**scope**
 
 Optional. Defines the scopes of your OAuth app whitespace seperated. Defaults to `read write follow`.
 

diff --git a/examples/authorization.js b/examples/authorization.js
@@ -7,26 +7,32 @@ const rl = readline.createInterface({
     output: process.stdout
 })
 
+let clientId
+let clientSecret
+
 Mastodon.createOAuthApp()
     .catch(err => console.error(err))
     .then((res) => {
         console.log('Please save \'id\', \'client_id\' and \'client_secret\' in your program and use it from now on!')
         console.log(res)
-        return Mastodon.getAuthorizationUrl(res.client_id, res.client_secret)
+
+        clientId = res.client_id
+        clientSecret = res.client_secret
+
+        return Mastodon.getAuthorizationUrl(clientId, clientSecret)
     })
-    .then((data) => {
+    .then(url => {
         console.log('This is the authorization URL. Open it in your browser and authorize with your account!')
-        console.log(data.url)
+        console.log(url)
         return new Promise((resolve) => {
-            rl.question('Please enter the code from the website: ', (code) => {
-                data.code = code
-                resolve(data)
+            rl.question('Please enter the code from the website: ', code => {
+                resolve(code)
                 rl.close()
             })
         })
     })
-    .then(data => Mastodon.getAccessToken(data.clientId, data.clientSecret, data.code))
+    .then(code => Mastodon.getAccessToken(clientId, clientSecret, code))
     .catch(err => console.error(err))
-    .then((accessToken) => {
+    .then(accessToken => {
         console.log(`This is the access token. Save it!\n${accessToken}`)
     })
diff --git a/src/mastodon.js b/src/mastodon.js
@@ -324,9 +324,9 @@ class Mastodon {
     }
 
     static getAuthorizationUrl(clientId, clientSecret,
-                               { baseUrl = DEFAULT_REST_BASE,
+                               baseUrl = DEFAULT_REST_BASE,
                                scope = 'read write follow',
-                               redirectUri = 'urn:ietf:wg:oauth:2.0:oob' }) {
+                               redirectUri = 'urn:ietf:wg:oauth:2.0:oob') {
         return new Promise((resolve) => {
             const oauth = new OAuth2(clientId, clientSecret, baseUrl, null, '/oauth/token')
             const url = oauth.getAuthorizeUrl({
@@ -335,7 +335,7 @@ class Mastodon {
                 client_id: clientId,
                 scope
             })
-            resolve({ clientId, clientSecret, url })
+            resolve(url)
         })
     }