Skip to content

Getting it running #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Getting it running #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6191c71
Add .gitkeep to dist/ so it is there at build
BigBlueHat Apr 11, 2015
ea7deae
Add leveldown to dependencies since default
BigBlueHat Apr 11, 2015
911963e
Add a space to `Token url for` message
BigBlueHat Apr 11, 2015
40ca43c
Ignoring `data` and `dist/*`
BigBlueHat Apr 11, 2015
a5a291f
Add basic DEVELOPMENT doc
BigBlueHat Apr 11, 2015
32ab2ee
Handle localhost/127.0.0.1 weirdness
BigBlueHat Apr 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node_modules
tmp
npm-debug.log
npm-debug.log
data
dist/*
16 changes: 16 additions & 0 deletions DEVELOPMENT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Developing pouch.host

## Install

```
$ npm install
$ export DEBUG=janus
$ export EMAIL_ADDRESS={from_address}
$ export EMAIL_PASSWORD={from_password}
$ export EMAIL_SMTP={smtp_server}
$ npm run dev
```

If you set set `DEBUG`, the login token will be added to the console output, so
the SMTP settings then are technically optional...unless you're testing them.
:grinning:
Empty file added dist/.gitkeep
View file
Open in desktop
Empty file.
7 changes: 6 additions & 1 deletion lib/server/janus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var Janus = function(host, PouchDB) {
Janus.prototype.sendToken = function(email, token, host, cb) {

var url = this.tokenUrl(token, host, email);
debug('Token url for' + email + ' is: ' + url);
debug('Token url for ' + email + ' is: ' + url);

if (!process.env.EMAIL_ADDRESS ||
!process.env.EMAIL_PASSWORD ||
Expand All @@ -61,6 +61,11 @@ Janus.prototype.sendToken = function(email, token, host, cb) {
};

Janus.prototype.tokenUrl = function(token, host, uid) {
var authority = this.host;
// Handle 127.0.0.1 / localhost mismatch
if (this.host === 'http://127.0.0.1/' && host == 'http://localhost/') {
authority = host;
}
return this.host + 'validate/?token=' + token +
'&uid=' + encodeURIComponent(uid) +
'&host=' + encodeURIComponent(host);
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"browserify": "^6.3.2",
"lie": "^2.8.0",
"pouchdb-express-router": "0.0.1",
"cookie-session": "^1.1.0"
"cookie-session": "^1.1.0",
"leveldown": "^0.10.4"
},
"devDependencies": {
"nodemon": "^1.2.1",
Expand Down