Skip to content

Commit 8938edc

Browse files
Merge pull request Human-Connection#51 in HC/hc-api-feathers from master to develop
* commit '136a766a3c511212da4184ff0dd87b1bbb398848': remove unused import fixed badges seeder fixed badges seeder QUICKFIX - disabled helmet
2 parents b090fbf + 136a766 commit 8938edc

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

server/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const path = require('path');
22
const favicon = require('serve-favicon');
33
const compress = require('compression');
44
const cors = require('cors');
5-
const helmet = require('helmet');
5+
// const helmet = require('helmet');
66
const bodyParser = require('body-parser');
77

88
const feathers = require('feathers');
@@ -49,7 +49,7 @@ if (app.get('sentry').dns !== undefined && app.get('sentry').dns !== 'SENTRY_DNS
4949

5050
// Enable CORS, security, compression, favicon and body parsing
5151
app.use(cors());
52-
app.use(helmet());
52+
// app.use(helmet());
5353
app.use(compress());
5454
app.use(bodyParser.json());
5555
app.use(bodyParser.urlencoded({ extended: true }));

server/seeder/base/badges.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ module.exports = (seederstore, app) => {
44
{
55
type: 'role',
66
status: 'temporary',
7-
key: 'admin'
7+
key: 'user_role_admin'
88
},
99
{
1010
type: 'role',
1111
status: 'temporary',
12-
key: 'moderator'
12+
key: 'user_role_moderator'
1313
},
1414
{
1515
type: 'role',
1616
status: 'temporary',
17-
key: 'developer'
17+
key: 'user_role_developer'
1818
},
1919
{
2020
type: 'crowdfunding',

server/seeder/base/users-admin.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const seedHelpers = require('../../helper/seed-helpers');
1+
const { keys } = require('lodash');
22

33
module.exports = (seederstore) => {
44
return {
@@ -14,20 +14,22 @@ module.exports = (seederstore) => {
1414
timezone: 'Europe/Berlin',
1515
avatar: '{{internet.avatar}}',
1616
coverImg: 'https://source.unsplash.com/random/1250x280',
17-
badgeIds: () => [seedHelpers.randomItem(seederstore.badges)._id],
17+
badgeIds: () => [keys(seederstore.badges)[0]],
18+
role: 'admin',
1819
doiToken: null,
1920
confirmedAt: null,
2021
deletedAt: null
2122
},
2223
{
2324
2425
password: '1234',
25-
name: 'Greg',
26+
name: 'Hans',
2627
isnothere: true,
2728
timezone: 'Europe/Berlin',
28-
avatar: 'https://www.dropbox.com/s/svd9y6hkkgwkgoc/avatar.jpg?dl=1',
29-
coverImg: 'https://www.dropbox.com/s/vzv05ffc0nelra9/header.png?dl=1',
30-
badgeIds: [],
29+
avatar: '{{internet.avatar}}',
30+
coverImg: 'https://source.unsplash.com/random/1250x280',
31+
role: 'moderator',
32+
badgeIds: () => [keys(seederstore.badges)[1]],
3133
doiToken: null,
3234
confirmedAt: null,
3335
deletedAt: null

0 commit comments

Comments
 (0)