update shanbay private api

assets/manifest.json

@@ -44,6 +44,7 @@
     "storage",
     "activeTab",
     "tabs",
+    "notifications",
     "http://dict.youdao.com/",
     "https://api.shanbay.com/"
   ]

build.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCinep+LvPP9QVz
+cFTrWmSGIvEG9YId8DyYJJudIKtpZXtt7vAum7etFtJaVoEyC/ucVLvcvtDPBI+9
+ixgL1iMuITfBY8uk6UpjghkT0kl5HR+oa6U8aNMr1MFdcMXIwd753s9ci6a/2cjh
+Apvp82Wpkrhs+N/d/GbA5dyoawYZIXXgqBKKIP323PFjezmW1NGcwNoFY7GQeAqs
+M1VGAsiHzVoauWwPgcl+USvLfFJXd0m+zw00BRPbbmFEY+bivVvxI0Lapi8iO453
+L+WONScwQCrJvZlILD+aoxlEX9lS6ZJtmek30o0v/lxICBBqVG2BkzpOMuL3n6G+
+yDGPs9aDAgMBAAECggEAMSHXTKKxBZ75M6S385gPETwTaM/arWL9W9aLsdDCGYkQ
+3uk3Zk2kFEb17Vd/l3hpYBV14T9B5ZpyN4mEDWd4n6JnryWQzNWzpRcUrpl1m4NC
+ImfLt9HQI8kXVz0QdRSmYwZ/zm1fR03s1JcuNmRUzgRHdp1HPlHZVeTdY4FaiVLI
+cq4nMAayY14oXL8CmEjSQIP+cNUvhYrSHgZRPdH3Lul4Kh4qsg3uS9Btjp4uydCL
+TKKbFXGJ+AUtzfvIJUpwx3pjwBqBIvlUL8Mqp/kJMA3X50PNrZEq9RL5pnWvLbC1
+09EzgVCAnLDTGjYLiWQTjgGBNUp3FGLHXptZNdOAMQKBgQDQCprue7gAxS1xbAKd
+fjtT/LIX/6X3Ro1LO+LyuI+E2IOuH3wDR1SyFjzYx+LWtAFGPVb5mmPz5PaebzeU
+80kE3RfYkjoR9ldAKiFW/PJMf9ADrZPhwHvTc1zeGurbEi4hl9eRsdNWueolxjBp
+VUFXuGN997g5XXZRlUSsJ3wdmwKBgQDIGp34HAnUMk/exg2VAeQ5aMwmbbE1S5sw
+ec+Zbs6DwrlZMRVYimu9NOyg6JUBIHNmkAp1UGtcu6qclnLetuJSvD53qFzKWCqY
+yB65qCLKBeVglt9aJEUYVXtvnujMt+jqwhglJZM1NGVUcxAkIqrk1kT81BkZI7YE
+yIA6B+ctOQKBgQDNUiomRCQNXozC6/6IwRR8h2CdHsoFibPZFHmfY1cBnU4Ygyo5
+ciS8vgW/TUcq7uxzDgbQwPb0tnxPUSRh9NmT20C1lVuKbr0drnbJC0t3BI2fk6fn
+nbiXr7tv2NEA9KhiryEpwX76kPHt5fPRgTrEAE7w+5LtyrgDPHZSEYYFEQKBgBZA
+n4CP3afzUF59t9TyOOcJeGptmF9M4R0q7qMpZ13PsbzxcGZAPmr0D7x1INzXNv4Y
+1pDlOIs/c2GmeW+69sAsnuW/m1IFK/eBiakrwXKl5TQwkvX7QpPKLcfj7A+YBBbX
+LsgyvYQVJ4+UnB7onAiGq3VSQNhC2GL/yQKrDlJBAoGAQlyTpRpZZ/s27dI9J4Tj
+eVzcBdMVizt/vbnfCfmIGSahzmgOzIn2Zj76L9GSOvcgtRAd+sU2JXZLaKFBnS5P
+iXxq1OfKLZK7fwjC4Up4lYJ7vNqpYbSTR8a5HlMgKcV1ZJiHG/ThlZe1qyFqvdq4
+4hpG3DYVv7mEwtgMa516a0E=
+-----END PRIVATE KEY-----

src/components/add_word.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import icons from './icons'
 import { addNotebookWord } from '../message'
 
-const SHANBAY_URL = 'https://www.shanbay.com/bdc/learnings/library/'
+const SHANBAY_URL = 'https://web.shanbay.com/wordsweb/#/collection'
 
 const styles = {
   container: {
@@ -24,18 +24,33 @@ const styles = {
     width: 8,
     height: 8,
   },
+  check: {
+    position: 'absolute',
+    left: 8,
+    bottom: 0,
+    width: 10,
+    height: 10,
+  },
+  invalid: {
+    position: 'absolute',
+    left: 8,
+    bottom: 0,
+    width: 10,
+    height: 10,
+  },
 }
 
 class AddWord extends Component {
   constructor(props) {
     super(props)
 
-    const { defaultAdded } = props
+    const { defaultAdded, defaultInvalid } = props
 
     this.addWord = this.addWord.bind(this)
 
     this.state = {
       added: defaultAdded,
+      invalid: defaultInvalid
     }
   }
 
@@ -45,17 +60,17 @@ class AddWord extends Component {
 
   addWord() {
     const { word } = this.props
-
     addNotebookWord(word).then((response) => {
       const { success, msg } = response
-
-      if (!success) {
-        throw new Error(msg)
+
+      if (!!success) {
+        this.setState({ added: true, })
+      } else if(msg == 'Invalid Token!') {
+        this.setState({ invalid: true, added: false })
+      } else {
+        throw new Error(msg);
       }
 
-      this.setState({
-        added: true,
-      })
     }).catch((err) => {
       this.props.flash(err.message)
     })
@@ -64,32 +79,46 @@ class AddWord extends Component {
   render() {
     const { addWord } = this
     const { word, showWordsPage } = this.props
-    const { added } = this.state
+    const { added, invalid } = this.state
 
     if (!word || !showWordsPage) {
       return null
     }
 
     const content = (
-      <div style={{ display: 'inline-block' }}>
-        <img
-          src={icons.book}
-          style={styles.book}
-          alt="book"
-        />
-        {!added ? (
+      <div style={{ display: 'inline-block' } }>
+
+        { !!invalid ? (
+          <img
+            src={icons.invalid}
+            style={styles.invalid}
+            alt="invalid"
+          />
+        ) : !added? (
           <img
             src={icons.plus}
             style={styles.plus}
             alt="plus"
           />
-        ) : null}
+        ) : (
+          <img
+            src={icons.check}
+            style={styles.check}
+            alt="check"
+          />
+        ) }
+
+        <img
+          src={icons.book}
+          style={styles.book}
+          alt="book"
+        />
       </div>
     )
 
     return added ? (
       <a
-        title="点击加入扇贝词库"
+        title="单词本中查看"
         style={styles.container}
         href={SHANBAY_URL}
         target="_blank"
@@ -114,12 +143,14 @@ AddWord.propTypes = {
   showWordsPage: bool.isRequired,
   word: string,
   defaultAdded: bool,
+  defaultInvalid: bool,
   flash: func.isRequired,
 }
 
 AddWord.defaultProps = {
   word: '',
   defaultAdded: false,
+  defaultInvalid: false,
 }
 
 export default AddWord

src/components/audio.js

@@ -5,7 +5,7 @@ import icons from './icons'
 const { string } = PropTypes
 
 function getAudioURL(word, type = 1) {
-  return `http://dict.youdao.com/dictvoice?audio=${word}&type=${type}`
+  return `https://dict.youdao.com/dictvoice?audio=${word}&type=${type}`
 }
 
 class Audio extends Component {

src/event_page.js

@@ -1,10 +1,9 @@
 import { EVENTS, onMessage } from './message'
 import { parse } from './parse'
-import { getWordURL, have } from './words'
-import ShanbayOauth from './lib/shanbay_oauth2'
+import { getWordURL, have } from './words' 
+import { lookUp, addWord, notify } from './shanbay_api'
 
 const { CLEAR_SHANBAY_TOKEN, SEARCH_WORD, OPEN_NEW_TAB, ADD_WORD_SHANBAY } = EVENTS
-let oauth = null
 
 async function getWordExplain(body) {
   const explain = parse(body)
@@ -26,107 +25,38 @@ async function getWords(word, sendRes) {
   sendRes(explain)
 }
 
-function authorize() {
-  return new Promise((resolve) => {
-    oauth.authorize(() => {
-      resolve()
-    })
-  })
-}
-
-const ADD_WORD_URL = 'https://api.shanbay.com/bdc/learning/'
-const SEARCH_WORD_URL = 'https://api.shanbay.com/bdc/search/'
-
-function getWord(url) {
-  return fetch(url).then(res => res.json()).then((res) => {
-    const { data, msg } = res
-
-    if (msg !== 'SUCCESS') {
-      throw new Error(msg)
-    }
-
-    return data
-  })
-}
-
-function clearShanbayToken() {
-  oauth.clearToken()
-}
-
 async function addWordToShanbay(data, sendRes) {
-  // redirect
-  if (!oauth.token_valid()) {
-    await authorize()
-  }
-
-  const token = oauth.access_token()
-
-  const searchURL = `${SEARCH_WORD_URL}?word=${data}&access_token=${token}`
 
   let response = null
-
   try {
-    response = await getWord(searchURL)
+    // get shanbay word id
+    response = await lookUp(data)
+    const { id } = response
+
+    // add word
+    addWord(id)
+
+    sendRes({ success: true })
   } catch (err) {
-    // 如果token失效，清除token并重新添加
-    if (err.message === 'Invalid token') {
-      clearShanbayToken()
-      await addWordToShanbay(data, sendRes)
+    if (err.msg == "单词没找到") {
+      sendRes({ success: false, msg: 'Shabay: Word Not Found!' })
       return
     }
 
-    sendRes({
-      success: false,
-      msg: err.message,
-    })
-
-    return
-  }
-
-  const { id } = response
-
-  const addWordURL = `${ADD_WORD_URL}?access_token=${token}`
-
-  try {
-    response = await fetch(addWordURL, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        id,
-        access_token: token,
-      }),
-    }).then(res => res.json()).then((res) => {
-      const { data: d, msg } = res
-
-      if (msg !== 'SUCCESS') {
-        throw new Error(msg)
-      }
-
-      return d
-    })
-  } catch (err) {
-    sendRes({
-      success: false,
-      msg: err.message,
+    sendRes({ success: false, msg: 'Invalid Token!' })
+    notify({
+      title: '扇贝认证失败！',
+      message: '登录后才能使用生词本功能。\n点击此消息前往扇贝登录',
+      url: 'https://web.shanbay.com/web/account/login/'
     })
-
-    return
   }
-
-  sendRes({
-    success: true,
-  })
 }
 
 function openNewTab(word) {
   chrome.tabs.create({ url: getWordURL(word) })
 }
 
 function init() {
-  oauth = ShanbayOauth.initPage()
-
   onMessage(SEARCH_WORD, (data, sendRes) => {
     getWords(data, sendRes)
   })