|
5 | 5 | var request = require('request'),
|
6 | 6 | through = require('through2'),
|
7 | 7 | vinyl = require('vinyl'),
|
8 |
| - nsconfig = require('../../nsconfig'), |
| 8 | + nsconfig = require('nsconfig'), |
9 | 9 | path = require('path');
|
10 | 10 |
|
11 | 11 | var PARAMS_DEF = [
|
@@ -158,39 +158,30 @@ function _requestOpts (params) {
|
158 | 158 | server = process.env.NS_SERVER || `https://rest.${params.realm}/app/site/hosting/restlet.nl`;
|
159 | 159 | //NS_SERVER = testing + nsmockup
|
160 | 160 |
|
161 |
| - if (params.token) { |
162 |
| - |
163 |
| - return { |
164 |
| - url: server, |
165 |
| - qs: { |
166 |
| - script: params.script, |
167 |
| - deploy: params.deployment |
168 |
| - }, |
169 |
| - method: 'POST', |
170 |
| - oauth: { |
171 |
| - consumer_key: params.consumerKey, |
172 |
| - consumer_secret: params.consumerSecret, |
173 |
| - token: params.token, |
174 |
| - token_secret: params.tokenSecret, |
175 |
| - realm: params.account |
176 |
| - } |
177 |
| - }; |
| 161 | + var options = { |
| 162 | + url: server, |
| 163 | + qs: { |
| 164 | + script: params.script, |
| 165 | + deploy: params.deployment |
| 166 | + }, |
| 167 | + method: 'POST' |
| 168 | + }; |
178 | 169 |
|
| 170 | + if (params.token) { |
| 171 | + options.oauth = { |
| 172 | + consumer_key: params.consumerKey, |
| 173 | + consumer_secret: params.consumerSecret, |
| 174 | + token: params.token, |
| 175 | + token_secret: params.tokenSecret, |
| 176 | + realm: params.account |
| 177 | + } |
179 | 178 | } else {
|
180 |
| - |
181 |
| - return { |
182 |
| - url: server, |
183 |
| - qs: { |
184 |
| - script: params.script, |
185 |
| - deploy: params.deployment |
186 |
| - }, |
187 |
| - method : 'POST' , |
188 |
| - headers: { |
189 |
| - authorization: `NLAuth nlauth_account=${params.account},nlauth_email=${params.email},nlauth_signature=${params.password}${nlauthRolePortion}` |
190 |
| - } |
191 |
| - }; |
192 |
| - |
| 179 | + options.headers = { |
| 180 | + authorization: `NLAuth nlauth_account=${params.account},nlauth_email=${params.email},nlauth_signature=${params.password}${nlauthRolePortion}` |
| 181 | + } |
193 | 182 | }
|
| 183 | + |
| 184 | + return options; |
194 | 185 | }
|
195 | 186 |
|
196 | 187 |
|
|
0 commit comments