Skip to content

Commit c5c9e31

Browse files
committed
added request headers settings to source requests
1 parent 2a5cc3f commit c5c9e31

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

src/utility/MapboxError.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ export default {
22
getKey:(error)=>{
33

44
/*
5-
error
5+
error example
66
{
77
message:'layers[0].paint.background-color: color expected, "#37474" found'
88
}
99
*/
1010

1111
if (!error || !error.message || error.message.indexOf(':') === -1) return ['general'];
12-
// error.message is defined
1312
const prefix = error.message.split(':')[0];
1413
const parts = prefix.split('.');
1514
let key = [];
@@ -25,11 +24,12 @@ export default {
2524
}
2625
key.push(part);
2726
});
28-
console.log('key:',key);
2927
return key;
3028
},
3129
getMessage:(error)=>{
32-
if (!error || !error.message) return 'unidentified error';
30+
if (!error) return;
31+
if (!error.message && error.stack) return error.stack;
32+
if (!error.message && !error.stack) return 'unidentified mapbox error';
3333
if (error.message.indexOf(':') === -1) return error.message;
3434
return error.message.split(':')[1];
3535
}

src/view/Vmap/Vmapbox.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ export default class Vmapbox extends React.Component {
163163
if (!matchKey) return {url: url};
164164
const settings = Msource.getSettings(matchKey);
165165

166-
if (!settings.has('authToken')){
166+
if (!settings.has('headers')){
167167
return {url: url};
168168
}
169169
return {
170170
url: url,
171-
headers: { 'Authorization': 'Bearer '+settings.get('authToken') }
171+
headers: settings.get('headers').toJS()
172172
}
173173
}
174174
},

src/view/Vsource/VsourceSettings.jsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default class VsourceSettings extends React.Component {
3232

3333
this.state = {
3434
authToken:settings && settings.get('authToken'),
35-
focus:null
35+
headers:settings && settings.get('headers'),
3636
};
3737

3838
this.handle = {
@@ -62,13 +62,13 @@ export default class VsourceSettings extends React.Component {
6262
const {error, handle, sourceKey, style, source} = this.props;
6363

6464
return <form onSubmit={this.handle.submit} className="p-2">
65-
<Vproperty key="authToken" property={{
65+
<Vproperty key="headers" property={{
6666
hideOptions:true,
67-
name:'authToken',
68-
label:'authorization token',
69-
spec:{doc:'Token to be attached to source requests'},
70-
value:this.state.authToken,
71-
error:error && error.get && error.get('authToken')
67+
name:'headers',
68+
label:'request headers',
69+
spec:{doc:'Headers attached to source requests', type:'*'},
70+
value:this.state.headers,
71+
error:error && error.get && error.get('headers')
7272
}} focus={this.state.focus} handle={this.handle}/>
7373
<div className="pt-2">
7474
<button type="submit" className="btn btn-primary">Save</button>

0 commit comments

Comments
 (0)