Adding issue links and file upload

jdalrymple · Jul 30, 2017 · 6f77ee0 · 6f77ee0
1 parent 93aa534
commit 6f77ee0
Show file tree

Hide file tree

Showing 23 changed files with 55 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -87,6 +87,12 @@ MIT
 
 Changelog
 =========
+
+[1.0.12](https://github.com/jdalrymple/node-gitlab-api/commit/) (2017-07-30)
+------------------
+- Added issue links (for related issues)
+- Fixed project file upload
+
 [1.0.11](https://github.com/jdalrymple/node-gitlab-api/commit/af4eb6955f583b5be4a4032d2d532d81bb2cf54d) (2017-07-20)
 ------------------
 - Fixing the problem where Id was used instead of IId's for Project issues

diff --git a/src/API.js b/src/API.js
@@ -1,4 +1,5 @@
 const Request = require('request-promise');
+
 const { Groups, Projects, Issues, Runners, Users, Labels } = require('./Models');
 
 function defaultRequestWithQS(url, endpoint, headers, options) {
@@ -19,6 +20,15 @@ function defaultRequestWithBody(url, endpoint, headers, options) {
   };
 }
 
+function defaultRequestWithFormData(url, endpoint, headers, options) {
+  return {
+    url: url + endpoint,
+    headers,
+    json: true,
+    formData: options,
+  };
+}
+
 class API {
   constructor({ url = 'https://gitlab.com', token, oauthToken }) {
     this.url = `${url}/api/v4/`;
@@ -48,6 +58,14 @@ class API {
     return Request.post(defaultRequestWithBody(this.url, endpoint, this.headers, options));
   }
 
+  postForm(endpoint, options) {
+    const formHeader = Object.assign(this.headers, {
+      'content-type': 'multipart/form-data',
+    });
+
+    return Request.post(defaultRequestWithFormData(this.url, endpoint, formHeader, options));
+  }
+
   put(endpoint, options) {
     return Request.put(defaultRequestWithBody(this.url, endpoint, this.headers, options));
   }

diff --git a/src/BaseModel.js → src/Models/BaseModel.js b/src/BaseModel.js → src/Models/BaseModel.js
@@ -11,6 +11,10 @@ class BaseModel {
     return this.client.post(endpoint, options);
   }
 
+  postForm(endpoint, options) {
+    return this.client.postForm(endpoint, options);
+  }
+
   put(endpoint, options) {
     return this.client.put(endpoint, options);
   }

diff --git a/src/Models/Groups.js b/src/Models/Groups.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 const ACCESS_LEVELS = {

diff --git a/src/Models/Issues.js b/src/Models/Issues.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class Issues extends BaseModel {

diff --git a/src/Models/Labels.js b/src/Models/Labels.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class Labels extends BaseModel {

diff --git a/src/Models/ProjectDeployKeys.js b/src/Models/ProjectDeployKeys.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectKeys extends BaseModel {

diff --git a/src/Models/ProjectHooks.js b/src/Models/ProjectHooks.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectHooks extends BaseModel {

diff --git a/src/Models/ProjectIssueNotes.js b/src/Models/ProjectIssueNotes.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectIssueNotes extends BaseModel {

diff --git a/src/Models/ProjectIssues.js b/src/Models/ProjectIssues.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 const ProjectIssueNotes = require('./ProjectIssueNotes');
 

diff --git a/src/Models/ProjectLabels.js b/src/Models/ProjectLabels.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectLabels extends BaseModel {

diff --git a/src/Models/ProjectMembers.js b/src/Models/ProjectMembers.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectMembers extends BaseModel {

diff --git a/src/Models/ProjectMergeRequests.js b/src/Models/ProjectMergeRequests.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectMergeRequests extends BaseModel {

diff --git a/src/Models/ProjectMilestones.js b/src/Models/ProjectMilestones.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectMilestones extends BaseModel {

diff --git a/src/Models/ProjectPipelines.js b/src/Models/ProjectPipelines.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class Pipelines extends BaseModel {

diff --git a/src/Models/ProjectRepository.js b/src/Models/ProjectRepository.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectRepository extends BaseModel {

diff --git a/src/Models/ProjectRunners.js b/src/Models/ProjectRunners.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectRunners extends BaseModel {

diff --git a/src/Models/ProjectServices.js b/src/Models/ProjectServices.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectServices extends BaseModel {

diff --git a/src/Models/ProjectTriggers.js b/src/Models/ProjectTriggers.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class ProjectTriggers extends BaseModel {

diff --git a/src/Models/Projects.js b/src/Models/Projects.js
@@ -1,4 +1,5 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
+const Fs = require('fs');
 const Utils = require('../Utils');
 const ProjectMembers = require('./ProjectMembers');
 const ProjectHooks = require('./ProjectHooks');
@@ -106,9 +107,13 @@ class Projects extends BaseModel {
 
   upload(projectId, filePath) {
     const pId = Utils.parse(projectId);
+    const file = Fs.readFileSync(filePath);
 
-    return this.post(`projects/${pId}/uploads`, {
-      file: filePath,
+    return this.postForm(`projects/${pId}/uploads`, {
+      file: {
+        value: file,
+        contentType: 'application/octet-stream',
+      },
     });
   }
 }

diff --git a/src/Models/Runners.js b/src/Models/Runners.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class Runners extends BaseModel {

diff --git a/src/Models/UserKeys.js b/src/Models/UserKeys.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const Utils = require('../Utils');
 
 class UserKeys extends BaseModel {

diff --git a/src/Models/Users.js b/src/Models/Users.js
@@ -1,4 +1,4 @@
-const BaseModel = require('../BaseModel');
+const BaseModel = require('./BaseModel');
 const UserKeys = require('./UserKeys');
 const Utils = require('../Utils');