Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add jwt_key #14

Merged
merged 5 commits into from
Jan 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions client/components/FnRouteForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
<input type="text" class="form-control" placeholder="e.g. iron/hello" v-model="route.image" @keydown.enter.prevent="">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Jwt Key</label>
<div class="col-sm-9">
<input type="text" class="form-control" placeholder="" v-model="route.jwt_key" @keydown.enter.prevent="">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Type</label>
<div class="col-sm-9">
Expand Down
28 changes: 26 additions & 2 deletions client/components/FnRunFunction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,26 @@
<input type="text" class="form-control" v-model="route.path" disabled>
</div>
</div>
<div class="form-group" v-if="route.jwt_key">
<label class="col-sm-3 control-label">Jwt Key</label>
<div class="col-sm-9">
<input type="text" class="form-control" v-model="route.jwt_key" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Payload</label>
<div class="col-sm-9">
<textarea class="form-control" v-model="payload" placeholder="e.g. {}"></textarea>
<textarea class="form-control" v-model="payload" placeholder="e.g. {}" v-on:change="calculateToken"></textarea>
</div>
</div>
<div>
<div v-if="!route.jwt_key">
<h5>cURL command</h5>
<pre>curl -X POST -d '{{payload}}' {{apiUrl}}r/{{encodeURIComponent(this.app.name)}}/{{encodeURIComponent(this.route.path)}}</pre>
</div>
<div v-if="route.jwt_key">
<h5>cURL command</h5>
<pre>curl -X POST -H 'Authorization: Bearer {{authToken}}' -d '{{payload}}' {{apiUrl}}r/{{encodeURIComponent(this.app.name)}}/{{encodeURIComponent(this.route.path)}}</pre>
</div>

<div v-show="output">
<h5>Output</h5>
Expand All @@ -40,6 +50,7 @@
import Modal from '../lib/VueBootstrapModal.vue';
import { eventBus } from '../client';
import { defaultErrorHandler, getApiUrl } from '../lib/helpers';
const jwt = require('jsonwebtoken');

export default {
props: ['app'],
Expand All @@ -52,6 +63,7 @@ export default {
show: false,
submitting: false,
payload: '{}',
authToken: null,
output: null,
apiUrl: ''
}
Expand All @@ -71,6 +83,9 @@ export default {
method: 'POST',
data: JSON.stringify({payload: this.payload}),
contentType: "application/json",
headers: {
'X-Jwt-Key': this.route.jwt_key
},
dataType: 'json',
success: (res) => {
console.log("res", res);
Expand All @@ -84,6 +99,9 @@ export default {
}
})
},
calculateToken: function() {
this.authToken = jwt.sign(this.payload, this.route.jwt_key);
},
},
created: function (){
var t = this;
Expand All @@ -92,6 +110,12 @@ export default {
this.payload = '{}';
this.output = null;
this.show = true;
if(this.route.jwt_key) {
this.calculateToken();
}
});
eventBus.$on('calculateToken', () => {
this.calculateToken();
});
getApiUrl( url => t.apiUrl = url );
}
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"express": "~4.13.4",
"file-loader": "^0.8.5",
"imports-loader": "^0.6.5",
"jsonwebtoken": "^8.1.1",
"lodash": "^4.13.1",
"request": "^2.72.0",
"resolve-url-loader": "^1.4.3",
Expand Down
11 changes: 10 additions & 1 deletion server/controllers/routes.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var express = require('express');
var router = express.Router();
var jwt = require('jsonwebtoken');
var helpers = require('../helpers/app-helpers.js');

router.get('/:app/routes', function(req, res) {
Expand Down Expand Up @@ -62,8 +63,16 @@ router.post('/:app/routes/:route/run', function(req, res) {
res.status(400).json({msg: text});
}
var data = req.body.payload;
if (req.headers['x-jwt-key']) {
var token = jwt.sign(data, req.headers['x-jwt-key']);
var authHeader = {'Authorization': 'Bearer ' + token };
}
else {
var authHeader = {};
}
var path = "/r/" + encodeURIComponent(req.params.app)+ "/" + encodeURIComponent(req.params.route);
helpers.execApiEndpointRaw('POST', req, path, {}, data, successcb, errcb, authHeader);

helpers.execApiEndpointRaw('POST', req, "/r/" + encodeURIComponent(req.params.app)+ "/" + encodeURIComponent(req.params.route), {}, data, successcb, errcb);
});


Expand Down
10 changes: 6 additions & 4 deletions server/helpers/app-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,25 @@ exports.postApiEndpoint = function(req, path, params, postfields, successcb, err
exports.execApiEndpoint('POST', req, path, params, postfields, successcb, errorcb);
}

exports.execApiEndpoint = function(method, req, path, params, postfields, successcb, errorcb) {
exports.execApiEndpoint = function(method, req, path, params, postfields, successcb, errorcb, headers) {
var options = {
uri: exports.apiFullUrl(req, path),
method: method,
json: postfields
json: postfields,
headers: headers
};

console.log(options.method + " " + options.uri + ", params: ", options.json);

request(options, function(error, response, body){exports.requrestCb(successcb, errorcb, error, response, body)});
}

exports.execApiEndpointRaw = function(method, req, path, params, postfields, successcb, errorcb) {
exports.execApiEndpointRaw = function(method, req, path, params, postfields, successcb, errorcb, headers) {
var options = {
uri: exports.apiFullUrl(req, path),
method: method,
body: postfields
body: postfields,
headers: headers
};

console.log(options.method + " " + options.uri + ", params: ", options.body);
Expand Down