Merge branch 'mongodb'

Author: rutkai

.travis.yml

@@ -5,14 +5,29 @@ node_js:
   - '5'
   - '4'
   - '0.12'
+services:
+  - mongodb
 before_install:
   - npm install -g frisby
   - npm install -g jasmine-node
+  - npm install -g underscore
+  - npm install -g pow-mongodb-fixtures
   - ./generate_ssl.sh
 before_script:
+  - mongofixtures test fixtures
   - npm start &
   - sleep 5
 after_script:
   - process.exit()
 env:
-  - NODE_ENV=testing
+  - NODE_ENV=testing-config
+  - NODE_ENV=testing-mongodb
+  - NODE_ENV=testing-fallback
+matrix:
+  exclude:
+    - node_js: '6'
+      env: NODE_ENV=testing-fallback
+    - node_js: '5'
+      env: NODE_ENV=testing-fallback
+    - node_js: '0.12'
+      env: NODE_ENV=testing-fallback

CONTRIBUTION.md

@@ -6,18 +6,31 @@ For testing you will need FrisbyJs and Jasmine:
 
     npm install -g frisby
     npm install -g jasmine-node
+    npm install pow-mongodb-fixtures -g
+    npm install -g underscore
+
+Note: Underscore is required because of an issue in the dependencies of mongodb-fixtures.
 
 ## Running the tests
 
 First, start the server in testing mode:
 
-    NODE_ENV=testing node app.js
+    NODE_ENV=testing-config node app.js
+    
+(Re)populate the testing Mongodb database:
+
+    mongo test --eval \"db.dropDatabase()\"
+    mongofixtures test fixtures
 
 Then the tests:
 
-    NODE_ENV=testing jasmine-node test
+    NODE_ENV=testing-config jasmine-node test
 
-All tests must pass.
+All tests must pass. You have to repeat the steps above for all environments:
+
+* testing-config
+* testing-mongodb
+* testing-fallback
 
 ## Misc dev notes
 

README.md

@@ -11,7 +11,6 @@ However, Mjölnir is developed for replacing the authentication system of Minecr
 
 Features (planned):
 
-- Own users database
 - Backup authentication server (in proxy mode)
 - Rate limit
 

config/default.json

@@ -31,7 +31,10 @@
       "commonName": "apiserver.mojang.com"
     }
   },
-  "drivers": ["config"],
+  "drivers": ["config", "mongodb"],
+  "mongodb": {
+    "connectionStr": "mongodb://localhost:27017/mjolnir"
+  },
   "users": [
   ]
 }

config/testing.json renamed to config/testing-config.json

@@ -34,5 +34,6 @@
       "accessToken": "d41d8cd98f00b204e9800998ecf8427e",
       "lastLogin": "2015-04-23T18:25:43.511Z"
     }
-  ]
+  ],
+  "drivers": ["config"]
 }

config/testing-fallback.json

@@ -0,0 +1,39 @@
+{
+  "serverOwner": "Tester",
+  "timestampFormat": "YYYY-MM-DD HH:mm:ss| ",
+  "hashAlgorithm": "md5",
+  "secret": "test-token",
+  "authserver": {
+    "httpPort": 6666,
+    "httpsPort": 6667
+  },
+  "sessionserver": {
+    "httpPort": 6677,
+    "httpsPort": 6678
+  },
+  "apiserver": {
+    "httpPort": 6688,
+    "httpsPort": 6689
+  },
+  "users": [
+    {
+      "id": "650bed2c-9ef5-4b5f-b02c-61fa493c68b5",
+      "username": "test",
+      "password": "098f6bcd4621d373cade4e832627b4f6", // test using MD5
+      "playerName": "testPlayer",
+      "skinUrl": "steve.png"
+    },
+    {
+      "id": "0e565137-f983-49fe-ac61-15adfe19e962",
+      "username": "overlapUser",
+      "password": "912ec803b2ce49e4a541068d495ab570", // asdf using MD5
+      "playerName": "overlapPlayer",
+      "playerNameIndex": "overlapplayer",
+      "skinUrl": "steve.png"
+    }
+  ],
+  "drivers": ["config", "mongodb"],
+  "mongodb": {
+    "connectionStr": "mongodb://localhost:27017/test"
+  }
+}

config/testing-mongodb.json

@@ -0,0 +1,23 @@
+{
+  "serverOwner": "Tester",
+  "timestampFormat": "YYYY-MM-DD HH:mm:ss| ",
+  "hashAlgorithm": "md5",
+  "secret": "test-token",
+  "authserver": {
+    "httpPort": 6666,
+    "httpsPort": 6667
+  },
+  "sessionserver": {
+    "httpPort": 6677,
+    "httpsPort": 6678
+  },
+  "apiserver": {
+    "httpPort": 6688,
+    "httpsPort": 6689
+  },
+  "users": [],
+  "drivers": ["mongodb"],
+  "mongodb": {
+    "connectionStr": "mongodb://localhost:27017/test"
+  }
+}