Skip to content

Commit

Permalink
update webpack 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
leefsmp committed Jan 21, 2018
1 parent e6f177f commit ab63fd4
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 3 deletions.
17 changes: 17 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "BLD | DEV + HRM",
"program": "${workspaceRoot}/bin/start.js",
"env": {
"NODE_ENV":"development"
}
}
]
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"style-loader": "^0.12.4",
"superagent": "3.5.2",
"url-loader": "^0.5.8",
"webpack": "2.3.3",
"webpack": "3.10.0",
"webpack-dev-middleware": "1.10.1",
"webpack-hot-middleware": "2.18.0",
"webpack-manifest-plugin": "1.1.0",
Expand Down
3 changes: 2 additions & 1 deletion src/server/api/endpoints/forge.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ module.exports = function() {

} catch (ex) {

res.status(ex.status || 500)
res.status(ex.status || 404)
res.json(ex)
}
})
Expand Down Expand Up @@ -194,6 +194,7 @@ module.exports = function() {
req.session, 'viewables:read')

res.json({

expires_in: forgeSvc.getExpiry(token),
access_token: token.access_token,
scope: token.scope
Expand Down
2 changes: 1 addition & 1 deletion src/server/api/services/ForgeSvc.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default class ForgeSvc extends BaseSvc {

const memoId = {
refreshToken: args[0].forge.refreshToken,
socketId: args[0].socketId
sessionId: args[0].id
}

return JSON.stringify(JSON.stringify(memoId))
Expand Down

0 comments on commit ab63fd4

Please sign in to comment.