Skip to content

Commit

Permalink
Merge branch 'master' of http://github.com/datawheel/canon into featu…
Browse files Browse the repository at this point in the history
…re-improve-stories
  • Loading branch information
jhmullen committed Sep 30, 2021
2 parents 4d50340 + f673fbb commit a102fdf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion packages/cms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"*.css"
],
"description": "Content Management System for Canon sites.",
"version": "0.20.8",
"version": "0.20.9",
"author": "James Mullen",
"license": "MIT",
"bin": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cms/src/components/fields/ProfileSearch.css
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
}
}

&.inputFontSize-sm, @mixin max-sm {
&.inputFontSize-sm {
& .cms-profilesearch-icon {
width: 0.35em;
left: 0.22em;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"sideEffects": [
"*.css"
],
"version": "0.24.1",
"version": "0.24.2",
"description": "Reusable React environment and components for creating visualization engines.",
"main": "./src/index.js",
"types": "./types/index.d.ts",
Expand Down
7 changes: 6 additions & 1 deletion packages/core/src/auth/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ module.exports = function(app) {
})
);

app.get("/auth/isAuthenticated", isAuthenticated, (req, res) => res.json({...req.user, authenticated: true}));
app.get("/auth/isAuthenticated", isAuthenticated, (req, res) => {
const sanitizedUser = {...req.user, authenticated: true};
delete sanitizedUser.password;
delete sanitizedUser.salt;
return res.json(sanitizedUser);
});

app.get("/auth/logout", (req, res) => {
req.logout();
Expand Down

0 comments on commit a102fdf

Please sign in to comment.