Skip to content

build(deps): bump lodash from 4.17.15 to 4.17.19 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

build(deps): bump lodash from 4.17.15 to 4.17.19 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4ff421
feat: 提交一段有问题的代码
shouldnotappearcalm Jun 28, 2020
cf05288
build(deps): bump lodash from 4.17.15 to 4.17.19
dependabot[bot] Jul 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"homepage": "https://github.com/shouldnotappearcalm/yapi-plugin-interface-oauth2#readme",
"dependencies": {
"add": "^2.0.6",
"async-lock": "^1.2.4",
"axios": "^0.19.0",
"global": "^4.4.0",
"yarn": "^1.22.0",
Expand Down
81 changes: 45 additions & 36 deletions utils/syncTokenUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
const schedule = require('node-schedule');
var AsyncLock = require('async-lock');
const projectModel = require('models/project.js');
const oauthModel = require('../model/oauthModel.js');
const yapi = require('yapi.js');
const jobMap = new Map();

var lock = new AsyncLock({timeout: 5000});

class syncTokenUtils {
constructor(ctx) {
yapi.commons.log(
Expand Down Expand Up @@ -117,44 +120,50 @@ class syncTokenUtils {
'token更新定时器触发, getTokenUrl:' + oauthData.get_token_url
);
//对定时任务存在的必要性做判断
let projectData;
try {
projectData = await this.preRefresh(oauthData);
} catch (e) {
return;
}
lock.acquire(oauthData.project_id, async function(done) {
let projectData;
try {
projectData = await this.preRefresh(oauthData);
} catch (e) {
return;
}

let projectId = projectData._id;
let getTokenUrl = oauthData.get_token_url;
let method = oauthData.request_type;
let headers_data = oauthData.headers_data;
let result;
try {
if (method === 'GET') {
let params = oauthData.params;
result = await this.execGetToken(getTokenUrl, method, headers_data, params);
} else {
let dataType = oauthData.dataType;
let formData = oauthData.form_data;
let dataJson = oauthData.data_json;
result = await this.execGetToken(
getTokenUrl,
method,
headers_data,
formData,
dataJson,
dataType
);
let projectId = projectData._id;
let getTokenUrl = oauthData.get_token_url;
let method = oauthData.request_type;
let headers_data = oauthData.headers_data;
let result;
try {
if (method === 'GET') {
let params = oauthData.params;
result = await this.execGetToken(getTokenUrl, method, headers_data, params);
} else {
let dataType = oauthData.dataType;
let formData = oauthData.form_data;
let dataJson = oauthData.data_json;
result = await this.execGetToken(
getTokenUrl,
method,
headers_data,
formData,
dataJson,
dataType
);
}
let accessToken = this.getTokenByPath(result, oauthData.token_path);
//更新到对应的env上;
await this.updateProjectToken(accessToken, oauthData, projectData);
this.saveSyncLog(0, '环境：【' + oauthData.env_name + '】更新新的token【' + accessToken + '】成功', '1', projectId);
yapi.commons.log('环境：【' + oauthData.env_name + '】更新token成功');
done();
} catch (e) {
this.saveSyncLog(-1, '环境：【' + oauthData.env_name + '】数据格式出错，请检查', '1', projectId);
yapi.commons.log('环境：【' + oauthData.env_name + '】获取数据失败' + e.message);
done();
}
let accessToken = this.getTokenByPath(result, oauthData.token_path);
//更新到对应的env上;
await this.updateProjectToken(accessToken, oauthData, projectData);
this.saveSyncLog(0, '环境：【' + oauthData.env_name + '】更新新的token【' + accessToken + '】成功', '1', projectId);
yapi.commons.log('环境：【' + oauthData.env_name + '】更新token成功');
} catch (e) {
this.saveSyncLog(-1, '环境：【' + oauthData.env_name + '】数据格式出错，请检查', '1', projectId);
yapi.commons.log('环境：【' + oauthData.env_name + '】获取数据失败' + e.message);
}
}, function(err, ret) {
yapi.commons.log('更新 token 失败，' + err.message);
}, {});
}

/**
Expand Down