Skip to content

Commit

Permalink
v 0.18.2
Browse files Browse the repository at this point in the history
Bug Fixes

- solved problem with strictSSL
  • Loading branch information
gioboa committed Jul 9, 2019
1 parent 6e60273 commit a19b00f
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 11 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Add files here to ignore them from prettier formatting
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"printWidth": 140,
"singleQuote": true,
"useTabs": false,
"tabWidth": 2,
"semi": true,
"bracketSpacing": true
}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 0.18.2

### Bug Fixes

- solved problem with strictSSL

## 0.18.1

### Bug Fixes
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "jira-plugin",
"displayName": "Jira Plugin",
"description": "Manage your on-premises/cloud Jira in vscode",
"version": "0.18.1",
"version": "0.18.2",
"publisher": "gioboa",
"icon": "images/icons/icon.png",
"galleryBanner": {
Expand Down Expand Up @@ -42,7 +42,7 @@
"test": "npm run compile && TYPE=1 node ./scripts/rename-files.js && node ./node_modules/vscode/bin/test && TYPE=2 node ./scripts/rename-files.js",
"setup:settings": "npm run compile && TYPE=3 node ./scripts/rename-files.js && node ./node_modules/vscode/bin/test && TYPE=4 node ./scripts/rename-files.js",
"setup:settings:insiders": "npm run compile && TYPE=3 node ./scripts/rename-files.js && CODE_VERSION='insiders' node ./node_modules/vscode/bin/test && TYPE=4 node ./scripts/rename-files.js",
"prelint": "prettier --print-width 140 --single-quote --write 'src/**/*.ts'",
"prelint": "prettier --write 'src/**/*.ts'",
"lint": "tslint 'src/**/*.ts' --format stylish --fix"
},
"husky": {
Expand Down Expand Up @@ -408,6 +408,6 @@
"vscode": "^1.1.35"
},
"dependencies": {
"jira-connector": "^2.15.5"
"jira-connector": "^2.15.6"
}
}
4 changes: 3 additions & 1 deletion src/services/http.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export class Jira implements IJira {
host = host.replace('https://', '').replace('http://', '');
const portPosition = host.indexOf(':');
const port = portPosition !== -1 ? host.substring(portPosition + 1) : undefined;
const strictSSL = configuration.get(CONFIG.STRICT_SSL);

if (portPosition !== -1) {
host = host.substring(0, portPosition);
Expand All @@ -59,7 +60,8 @@ export class Jira implements IJira {
port,
protocol,
basic_auth: configuration.credentials,
timeout: configuration.get(CONFIG.REQUESTS_TIMEOUT) * 1000 * 60
timeout: configuration.get(CONFIG.REQUESTS_TIMEOUT) * 1000 * 60,
strictSSL: strictSSL !== '' ? strictSSL === 'true' : undefined
});

patchJiraInstance(this.jiraInstance);
Expand Down
4 changes: 0 additions & 4 deletions src/shared/jira-instance-patch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ export const patchJiraInstance = (jiraInstance: any) => {

jiraInstance.originalMakeRequest = jiraInstance.makeRequest;
const customMakeRequest = (options: any, callback: any, successString: any) => {
const strictSSL = configuration.get(CONFIG.STRICT_SSL);
if (strictSSL !== '') {
options.strictSSL = strictSSL === 'true';
}
return jiraInstance.originalMakeRequest(options, callback, successString);
};
jiraInstance.makeRequest = customMakeRequest;
Expand Down

0 comments on commit a19b00f

Please sign in to comment.