Merge pull request #41 from rozpuszczalny/bugfix/37-additional-option…

…s-from-config

#37 | Respect rejectUnauthorized and additionalHeaders in http(s) options

.eslintrc

@@ -6,7 +6,6 @@
  },
  "extends": [
  "plugin:@typescript-eslint/recommended",
- "prettier/@typescript-eslint",
  "plugin:prettier/recommended"
  ],
  "rules": {

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to the "vscode-redmine" extension will be documented in this
 
 ## [Unreleased]
 
+### Fixed
+
+- [Issue #37](https://github.com/rozpuszczalny/vscode-redmine/issues/37)
+
 ## 1.0.3 - 21.09.2020
 
 ### Fixed

package.json

@@ -150,15 +150,19 @@
  "watch": "tsc -watch -p ./"
  },
  "devDependencies": {
+ "@types/lodash": "^4.14.175",
  "@types/mocha": "^2.2.42",
  "@types/node": "^7.0.43",
  "@types/vscode": "^1.31.0",
- "@typescript-eslint/eslint-plugin": "^3.9.1",
- "@typescript-eslint/parser": "^3.9.1",
- "eslint": "^7.7.0",
- "eslint-config-prettier": "^6.11.0",
- "eslint-plugin-prettier": "^3.1.4",
+ "@typescript-eslint/eslint-plugin": "^5.0.0",
+ "@typescript-eslint/parser": "^5.0.0",
+ "eslint": "^8.0.0",
+ "eslint-config-prettier": "^8.3.0",
+ "eslint-plugin-prettier": "^4.0.0",
  "prettier": "^2.0.5",
  "typescript": "^3.9.7"
+ },
+ "dependencies": {
+ "lodash": "^4.17.21"
  }
 }

src/definitions/redmine-config.d.ts

@@ -16,7 +16,7 @@ export interface RedmineConfig extends WorkspaceConfiguration {
  /**
  * Pass rejectUnauthorized to https request options. Use only if your redmine instance has self-signed certificate!
  */
- rejectUnauthorized?: string;
+ rejectUnauthorized?: boolean;
  /**
  * Project identifier in Redmine
  */

src/extension.ts

@@ -61,6 +61,8 @@ export function activate(context: vscode.ExtensionContext): void {
  const redmineServer = new RedmineServer({
  address: config.url,
  key: config.apiKey,
+ additionalHeaders: config.additionalHeaders,
+ rejectUnauthorized: config.rejectUnauthorized,
  });
 
  const fromBucket = bucket.servers.find((s) =>

src/redmine/redmine-server.ts

@@ -14,6 +14,7 @@ import { TimeEntry } from "./models/time-entry";
 import { Issue } from "./models/issue";
 import { IssueStatus as RedmineIssueStatus } from "./models/issue-status";
 import { Membership as RedmineMembership } from "./models/membership";
+import { isEqual } from "lodash";
 
 type HttpMethods = "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
 
@@ -360,7 +361,9 @@ export class RedmineServer {
  compare(other: RedmineServer) {
  return (
  this.options.address === other.options.address &&
- this.options.key === other.options.key
+ this.options.key === other.options.key &&
+ this.options.rejectUnauthorized === other.options.rejectUnauthorized &&
+ isEqual(this.options.additionalHeaders, other.options.additionalHeaders)
  );
  }
 }

src/trees/my-issues-tree.ts

@@ -12,6 +12,8 @@ export class MyIssuesTree implements vscode.TreeDataProvider<Issue> {
  this.server = new RedmineServer({
  address: config.url,
  key: config.apiKey,
+ additionalHeaders: config.additionalHeaders,
+ rejectUnauthorized: config.rejectUnauthorized,
  });
  }
 

src/trees/projects-tree.ts

@@ -14,6 +14,8 @@ export class ProjectsTree
  this.server = new RedmineServer({
  address: config.url,
  key: config.apiKey,
+ additionalHeaders: config.additionalHeaders,
+ rejectUnauthorized: config.rejectUnauthorized,
  });
  }