Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-b5207f346ac7f974e4b02ef4a57b4917
Browse files Browse the repository at this point in the history
  • Loading branch information
megastary committed Nov 18, 2019
2 parents da89899 + 367a7fa commit 1895e5d
Show file tree
Hide file tree
Showing 11 changed files with 360 additions and 143 deletions.
3 changes: 0 additions & 3 deletions .travis.yaml

This file was deleted.

7 changes: 7 additions & 0 deletions .travis.yml
@@ -0,0 +1,7 @@
language: node_js
node_js:
- "node"
services: mongodb
before_script:
- sleep 15
- mongo smallbusinessfridge --eval 'db.createUser({user:"testusr",pwd:"testpwd",roles:["readWrite"]});'
18 changes: 9 additions & 9 deletions config/example.config.js
Expand Up @@ -8,13 +8,13 @@ exports.config = {

db: {

connstr: 'mongodb+srv://url'
connstr: 'mongodb://testusr:testpwd@localhost:27017/smallbusinessfridge'

},

cookie_secret: 'somethingverysecret',
parser_secret: 'alsosomethingverysecret',
api_secret: 'anothersomethingverysecret',
cookie_secret: 'verysecretverysecretverysecretverysecretverysecretoh',
parser_secret: 'ohverysecretverysecretverysecretverysecretverysecret',
api_secret: 'veryveryverysecretapikey',
debug: false
};

Expand All @@ -37,7 +37,7 @@ exports.creds = {

// Required

identityMetadata: 'https://login.microsoftonline.com/<tenant-guid>/v2.0/.well-known/openid-configuration',
identityMetadata: 'https://login.microsoftonline.com/v2.0/.well-known/openid-configuration',

// or you can use the common endpoint

Expand Down Expand Up @@ -71,7 +71,7 @@ exports.creds = {

// Required, the reply URL registered in AAD for your app

redirectUrl: 'https://lednice.example.com/auth/openid/return',
redirectUrl: 'https://example.com/auth/openid/return',



Expand Down Expand Up @@ -128,8 +128,8 @@ exports.creds = {
cookieEncryptionKeys: [

{
'key': 'verysecretkey',
'iv': 'verysecretiv'
'key': 'thiskeyhastobethirtytwobyteslong',
'iv': 'disbeshorter'
}

],
Expand Down Expand Up @@ -174,4 +174,4 @@ exports.creds = {

destroySessionUrl: "/"

};
};
185 changes: 115 additions & 70 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1895e5d

Please sign in to comment.