ExternalOAuth1 추가

Author: kakao-joo-yoon

src/main/apis/tistory-api.js

@@ -1,12 +1,14 @@
+const uuid = require('uuid').v4
 const fs = require('fs')
 const fetch = require('isomorphic-fetch')
 const querystring = require('querystring')
 const FormData = require('form-data')
 const {session} = require('electron')
 const stream = require('stream')
-const Oauth2infoReader = require('../oauth/OauthInfoReader')
+const OauthInfoReader = require('../oauth/OauthInfoReader')
 const appInfo = require('../appInfo')
 const ExternalOAuth2 = require('../oauth/ExternalOAuth2');
+const OAuthRequestManager = require('../oauth/OAuthRequestManager');
 
 const errorHandler = (res) => {
   if (!res.ok) {
@@ -19,18 +21,30 @@ const errorHandler = (res) => {
 }
 
 const BASE_URL = 'https://www.tistory.com/apis'
+const PROVIDER_ID = 'tistory'
 
-const requestAuth = () => {
-  const oauth2infoReader = new Oauth2infoReader()
-  const tistoryOAuth = new ExternalOAuth2(oauth2infoReader.getTistory())
-  tistoryOAuth.requestAuth({})
-  return tistoryOAuth.getState()
-}
+const requestAuth = (successHandler, failureHandler) => {
+  const oauthInfoReader = new OauthInfoReader()
+  const oauth2 = new ExternalOAuth2(oauthInfoReader.getTistory())
+  OAuthRequestManager.saveRequestInfo("oauth", (searchParams) => {
+    const code = searchParams.get("code")
+    oauth2.requestToken(code, 'GET')
+      .then(data => {
+        if (data.error) {
+          throw new Error(`${data.error}: ${data.error_description}`)
+        }
+
+        return {
+          uuid: uuid(),
+          provider: PROVIDER_ID,
+          authInfo: data
+        }
+      })
+      .then(successHandler)
+      .catch(failureHandler)
+  })
 
-const requestToken = (code) => {
-  const oauth2infoReader = new Oauth2infoReader()
-  const tistoryOAuth = new ExternalOAuth2(oauth2infoReader.getTistory())
-  return tistoryOAuth.requestToken(code, 'GET')
+  oauth2.requestAuth({})
 }
 
 const fetchBlogInfo = (auth) => {
@@ -252,7 +266,6 @@ const fetchAccount = async (auth) => {
 
 module.exports = {
   requestAuth: requestAuth,
-  requestToken: requestToken,
   fetchBlogInfo: fetchBlogInfo,
   fetchUser: fetchUser,
   fetchPosts: fetchPosts,

src/main/apis/tumblr-api.js

@@ -1,7 +1,37 @@
+const uuid = require('uuid').v4
 const OauthInfoReader = require('../oauth/OauthInfoReader')
 const oauth = require("../oauth/ElectronOauth1")
 const {session, BrowserWindow} = require('electron')
 const tumblr = require("tumblr.js")
+const ExternalOAuth1 = require('../oauth/ExternalOAuth1');
+const OAuthRequestManager = require('../oauth/OAuthRequestManager');
+
+const PROVIDER_ID = 'tumblr'
+
+const requestAuth = (successHandler, failureHandler) => {
+  const oauthInfoReader = new OauthInfoReader()
+  const oauth1 = new ExternalOAuth1(oauthInfoReader.getTumblr())
+  oauth1.requestAuth((requestTokens) => {
+    OAuthRequestManager.saveRequestInfo('oauth', (searchParams) => {
+      const verifier = searchParams.get("oauth_verifier")
+      oauth1.requestToken(verifier, requestTokens, (error, token, tokenSecret) => {
+        if (error) {
+          failureHandler()
+          return
+        }
+
+        successHandler({
+          uuid: uuid(),
+          provider: PROVIDER_ID,
+          authInfo: {
+            token, tokenSecret
+          }
+        })
+      })
+    })
+  })
+
+}
 
 const getAccessToken = () => {
   const window = new BrowserWindow({
@@ -158,6 +188,7 @@ const fetchAccount = async (auth) => {
 
 
 module.exports = {
+  requestAuth: requestAuth,
   getAccessToken: getAccessToken,
   fetchUser: fetchUser,
   fetchPosts: fetchPosts,

src/main/events/auth.js

@@ -37,32 +37,15 @@ module.exports = () => {
   ipcMain.on("request-auth", (evt, provider) => {
     console.log('Main.receive: request-auth', provider)
     let providerApi = ProviderApiManager.getApi(provider)
-    let state = providerApi.requestAuth()
-    OAuthRequestManager.saveRequestInfo(state, (code) => {
-      const providerApi = ProviderApiManager.getApi(provider)
-      providerApi.requestToken(code)
-        .then(data => {
-          if (data.error) {
-            throw new Error(`${data.error}: ${data.error_description}`)
-          }
-
-          return {
-            uuid: uuid(),
-            provider: provider,
-            authInfo: data
-          }
-        })
-        .then(saveAuth)
-        .then(auth => {
-          providerApi.fetchAccount(auth)
-            .then(account => {
-              evt.sender.send('receive-account', account)
-            })
-        })
-        .catch(e => {
-          console.error(e)
-          evt.sender.send('receive-message', `오류가 발생했습니다. (${e.message})`)
+    providerApi.requestAuth((auth) => {
+      saveAuth(auth)
+      providerApi.fetchAccount(auth)
+        .then(account => {
+          evt.sender.send('receive-account', account)
         })
+    }, e => {
+      console.error(e)
+      evt.sender.send('receive-message', `오류가 발생했습니다. (${e.message})`)
     })
   })
 

src/main/lib/AuthenticationManager.js

@@ -4,7 +4,7 @@ let initialized = false
 let authList = []
 
 function load() {
-  authList = settings.getSync('authList', [])
+  authList = settings.getSync('authList', []).filter(auth => auth != null)
   console.log("load authList", authList)
 }
 

src/main/main.js

@@ -27,10 +27,9 @@ app.on('window-all-closed', () => {
 
 app.on("open-url", (e, urlString) => {
   const url = new URL(urlString)
-  console.log("OPEN_URL", urlString, url, url.pathname, url.searchParams.get('code'), url.searchParams.get('state'))
-  const requestHandler = OAuthRequestManager.loadRequestInfo(url.searchParams.get('state'))
+  let requestHandler = OAuthRequestManager.loadRequestInfo("oauth")
   if (requestHandler) {
-    requestHandler(url.searchParams.get('code'))
+    requestHandler(url.searchParams)
   }
 })
 

src/main/oauth/ExternalOAuth1.js

@@ -0,0 +1,52 @@
+const electron = require('electron');
+const queryString = require('querystring');
+const OAuth = require('oauth').OAuth
+
+class ExternalOAuth2 {
+  #oauthInfo
+  #oauth
+  #requestTokens
+
+  constructor(oauthInfo) {
+    this.#oauthInfo = oauthInfo
+    this.#oauth = new OAuth(
+      oauthInfo.requestTokenUrl,
+      oauthInfo.tokenUrl,
+      oauthInfo.clientKey,
+      oauthInfo.clientSecret,
+      '1.0a',
+      oauthInfo.redirectUri,
+      'HMAC-SHA1'
+    )
+  }
+
+  requestAuth(successHandler) {
+    this.#oauth.getOAuthRequestToken((error, token, tokenSecret) => {
+      if (error) {
+        throw new Error(error)
+      }
+
+      this.#requestTokens = {
+        token, tokenSecret
+      }
+
+      electron.shell.openExternal(this.#oauthInfo.authorizeUrl + '?' + queryString.stringify({
+        oauth_token: token
+      }))
+
+      successHandler(this.#requestTokens)
+    })
+  }
+
+  requestToken(verifier, requestTokens, tokenHandler) {
+    this.#oauth.getOAuthAccessToken(
+      requestTokens.token,
+      requestTokens.tokenSecret,
+      verifier,
+      tokenHandler
+    )
+  }
+
+}
+
+module.exports = ExternalOAuth2

src/main/oauth/ExternalOAuth2.js

@@ -59,8 +59,6 @@ class ExternalOAuth2 {
       fetchOptions['body'] = queryString.stringify(tokenRequestData);
     }
 
-    console.log("requestToken", tokenMethod, url, fetchOptions)
-
     return fetch(url, fetchOptions)
       .then(res => res.json())
   }