From f25d17aa3f515c0a419dc4ed75cb88f475aa1620 Mon Sep 17 00:00:00 2001
From: DIYgod <diy.d.god@gmail.com>
Date: Tue, 3 Sep 2019 11:57:47 +0800
Subject: [PATCH] refactor: move pixiv client_id and client_secret

---
 lib/config.js                 | 2 --
 lib/routes/pixiv/bookmarks.js | 2 +-
 lib/routes/pixiv/ranking.js   | 2 +-
 lib/routes/pixiv/search.js    | 2 +-
 lib/routes/pixiv/token.js     | 6 +++---
 lib/routes/pixiv/user.js      | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/config.js b/lib/config.js
index 499ae98d3c..14ec37d51b 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -40,8 +40,6 @@ module.exports = {
     },
     nodeName: process.env.NODE_NAME,
     pixiv: {
-        client_id: 'MOBrBDS8blbauoSck0ZfDbtuzpyT',
-        client_secret: 'lsACyCD94FhDUtGTXi3QzcFE2uU1hqtDaKeqrdwj',
         username: process.env.PIXIV_USERNAME,
         password: process.env.PIXIV_PASSWORD,
     },
diff --git a/lib/routes/pixiv/bookmarks.js b/lib/routes/pixiv/bookmarks.js
index 8cfb91a2e3..e0d334bbc8 100644
--- a/lib/routes/pixiv/bookmarks.js
+++ b/lib/routes/pixiv/bookmarks.js
@@ -4,7 +4,7 @@ const getUserDetail = require('./api/getUserDetail');
 const config = require('@/config');
 
 module.exports = async (ctx) => {
-    if (!config.pixiv || !config.pixiv.client_id || !config.pixiv.client_secret || !config.pixiv.username || !config.pixiv.password) {
+    if (!config.pixiv || !config.pixiv.username || !config.pixiv.password) {
         throw 'pixiv RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#%E9%83%A8%E5%88%86-rss-%E6%A8%A1%E5%9D%97%E9%85%8D%E7%BD%AE">relevant config</a>';
     }
 
diff --git a/lib/routes/pixiv/ranking.js b/lib/routes/pixiv/ranking.js
index ea355979d0..ab68d6a095 100644
--- a/lib/routes/pixiv/ranking.js
+++ b/lib/routes/pixiv/ranking.js
@@ -33,7 +33,7 @@ const links = {
 };
 
 module.exports = async (ctx) => {
-    if (!config.pixiv || !config.pixiv.client_id || !config.pixiv.client_secret || !config.pixiv.username || !config.pixiv.password) {
+    if (!config.pixiv || !config.pixiv.username || !config.pixiv.password) {
         throw 'pixiv RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#%E9%83%A8%E5%88%86-rss-%E6%A8%A1%E5%9D%97%E9%85%8D%E7%BD%AE">relevant config</a>';
     }
 
diff --git a/lib/routes/pixiv/search.js b/lib/routes/pixiv/search.js
index 50915d1466..7abfaa1658 100644
--- a/lib/routes/pixiv/search.js
+++ b/lib/routes/pixiv/search.js
@@ -4,7 +4,7 @@ const searchIllust = require('./api/searchIllust');
 const config = require('@/config');
 
 module.exports = async (ctx) => {
-    if (!config.pixiv || !config.pixiv.client_id || !config.pixiv.client_secret || !config.pixiv.username || !config.pixiv.password) {
+    if (!config.pixiv || !config.pixiv.username || !config.pixiv.password) {
         throw 'pixiv RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#%E9%83%A8%E5%88%86-rss-%E6%A8%A1%E5%9D%97%E9%85%8D%E7%BD%AE">relevant config</a>';
     }
 
diff --git a/lib/routes/pixiv/token.js b/lib/routes/pixiv/token.js
index b44dd2829c..2b81d59248 100644
--- a/lib/routes/pixiv/token.js
+++ b/lib/routes/pixiv/token.js
@@ -10,8 +10,8 @@ const pixivConfig = config.pixiv;
 let token = null;
 
 const authorizationInfo = {
-    client_id: pixivConfig.client_id,
-    client_secret: pixivConfig.client_secret,
+    client_id: 'MOBrBDS8blbauoSck0ZfDbtuzpyT',
+    client_secret: 'lsACyCD94FhDUtGTXi3QzcFE2uU1hqtDaKeqrdwj',
     username: pixivConfig.username,
     password: pixivConfig.password,
 };
@@ -94,7 +94,7 @@ async function tokenLoop() {
     }
 }
 
-if (config.pixiv && config.pixiv.client_id && config.pixiv.client_secret && config.pixiv.username && config.pixiv.password) {
+if (config.pixiv && config.pixiv.username && config.pixiv.password) {
     tokenLoop();
 }
 
diff --git a/lib/routes/pixiv/user.js b/lib/routes/pixiv/user.js
index d54f6ea7b7..09ef08e10a 100644
--- a/lib/routes/pixiv/user.js
+++ b/lib/routes/pixiv/user.js
@@ -3,7 +3,7 @@ const getIllusts = require('./api/getIllusts');
 const config = require('@/config');
 
 module.exports = async (ctx) => {
-    if (!config.pixiv || !config.pixiv.client_id || !config.pixiv.client_secret || !config.pixiv.username || !config.pixiv.password) {
+    if (!config.pixiv || !config.pixiv.username || !config.pixiv.password) {
         throw 'pixiv RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#%E9%83%A8%E5%88%86-rss-%E6%A8%A1%E5%9D%97%E9%85%8D%E7%BD%AE">relevant config</a>';
     }