Skip to content
This repository has been archived by the owner on Nov 3, 2018. It is now read-only.

Commit

Permalink
hapi 0.16
Browse files Browse the repository at this point in the history
  • Loading branch information
Eran Hammer committed Apr 3, 2013
1 parent 812689d commit c41d44e
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion lib/api/details.js
View file
Expand Up @@ -78,7 +78,7 @@ exports.post = {
query: {
last: Hapi.types.Boolean()
},
schema: {
payload: {
type: Hapi.types.String().required().valid('text'),
content: Hapi.types.String().required()
}
Expand Down
8 changes: 4 additions & 4 deletions lib/api/project.js
View file
Expand Up @@ -99,7 +99,7 @@ exports.post = {
query: {
position: Hapi.types.Number().min(0)
},
schema: {
payload: {
title: Hapi.types.String(),
date: Hapi.types.String().regex(Utils.dateRegex).emptyOk(),
time: Hapi.types.String().regex(Utils.timeRegex).emptyOk(),
Expand Down Expand Up @@ -161,7 +161,7 @@ exports.post = {

exports.put = {
validate: {
schema: {
payload: {
title: Hapi.types.String().required(),
date: Hapi.types.String().regex(Utils.dateRegex).emptyOk(),
time: Hapi.types.String().regex(Utils.timeRegex).emptyOk(),
Expand Down Expand Up @@ -312,7 +312,7 @@ exports.participants = {
query: {
message: Hapi.types.String().max(250)
},
schema: {
payload: {
participants: Hapi.types.Array().includes(Hapi.types.String()), //!! ids or emails
names: Hapi.types.Array().includes(Hapi.types.String())
}
Expand Down Expand Up @@ -513,7 +513,7 @@ exports.participants = {

exports.uninvite = {
validate: {
schema: {
payload: {
participants: Hapi.types.Array().required().includes(Hapi.types.String())
}
},
Expand Down
2 changes: 1 addition & 1 deletion lib/api/session.js
View file
Expand Up @@ -42,7 +42,7 @@ exports.app = {

exports.login = {
validate: {
schema: {
payload: {
type: Hapi.types.String().valid('id', 'twitter', 'facebook', 'yahoo', 'email').required(),
id: Hapi.types.String().required(),
issueTo: Hapi.types.String()
Expand Down
2 changes: 1 addition & 1 deletion lib/api/storage.js
View file
Expand Up @@ -55,7 +55,7 @@ exports.get = {

exports.post = {
validate: {
schema: {
payload: {
value: Hapi.types.String().required()
}
},
Expand Down
4 changes: 2 additions & 2 deletions lib/api/task.js
View file
Expand Up @@ -112,7 +112,7 @@ exports.post = {
query: {
position: Hapi.types.Number().min(0)
},
schema: {
payload: {
title: Hapi.types.String(),
status: Hapi.types.String().valid('open', 'pending', 'close'),
participants: Hapi.types.Array().includes(Hapi.types.String()) //!! .emptyOk()
Expand Down Expand Up @@ -194,7 +194,7 @@ exports.put = {
position: Hapi.types.Number(),
suggestion: Hapi.types.String()
},
schema: {
payload: {
title: Hapi.types.String(),
status: Hapi.types.String().valid('open', 'pending', 'close')
}
Expand Down
10 changes: 5 additions & 5 deletions lib/api/user.js
View file
Expand Up @@ -74,7 +74,7 @@ exports.get = {

exports.post = {
validate: {
schema: {
payload: {
name: Hapi.types.String(),
username: Hapi.types.String().emptyOk()
}
Expand Down Expand Up @@ -140,7 +140,7 @@ exports.post = {

exports.email = {
validate: {
schema: {
payload: {
address: Hapi.types.String().required(),
action: Hapi.types.String().required().valid('remove', 'primary', 'add', 'verify')
}
Expand Down Expand Up @@ -432,7 +432,7 @@ exports.put = {
query: {
invite: Hapi.types.String().required()
},
schema: {
payload: {
username: Hapi.types.String(),
name: Hapi.types.String(),
network: Hapi.types.Array().includes(Hapi.types.String()),
Expand Down Expand Up @@ -722,7 +722,7 @@ exports.tos = {

exports.link = {
validate: {
schema: {
payload: {
id: Hapi.types.String().required()
}
},
Expand Down Expand Up @@ -919,7 +919,7 @@ exports.lookup = {

exports.reminder = {
validate: {
schema: {
payload: {
account: Hapi.types.String().required()
}
},
Expand Down
12 changes: 6 additions & 6 deletions lib/web/routes.js
View file
Expand Up @@ -13,39 +13,39 @@ var Tos = require('./tos');

exports.endpoints = [
{ method: 'GET', path: '/', handler: Home.get },
{ method: 'POST', path: '/', handler: Home.get },
{ method: 'POST', path: '/', handler: Home.get, config: { plugins: { crumb: false } } },

{ method: 'GET', path: '/login', handler: Login.login, config: { app: { hasMobile: true } } },
{ method: 'GET', path: '/logout', handler: Login.logout },
{ method: 'GET', path: '/auth/{network}', handler: Login.auth },
{ method: 'POST', path: '/auth/{network}', handler: Login.auth },
{ method: 'POST', path: '/auth/{network}', handler: Login.auth, config: { plugins: { crumb: false } } },
{ method: 'POST', path: '/account/unlink', handler: Login.unlink, config: { auth: { mode: 'required' } } },
{ method: 'GET', path: '/t/{token}', handler: Login.emailToken },

{ method: 'GET', path: '/account', handler: Account.get, config: { auth: { mode: 'required' } } },
{ method: 'GET', path: '/account/{panel}', handler: Account.get, config: { auth: { mode: 'required' } } },
{ method: 'POST', path: '/account/reminder', handler: Account.reminder, config: { app: { isApi: true } } }, // body: { account: {} }
{ method: 'POST', path: '/account/reminder', handler: Account.reminder, config: { plugins: { crumb: false }, app: { isApi: true } } }, // body: { account: {} }
{ method: 'POST', path: '/account/profile', handler: Account.profile, config: { auth: { mode: 'required' } } },
{ method: 'POST', path: '/account/emails', handler: Account.emails, config: { auth: { mode: 'required' } } }, //, body: { address: {}, action: {} } },

{ method: 'GET', path: '/tos', handler: Tos.get, config: { auth: { mode: 'required' } } },
{ method: 'POST', path: '/tos', handler: Tos.post, config: { auth: { mode: 'required' } } },

{ method: 'GET', path: '/signup/register', handler: Signup.form },
{ method: 'POST', path: '/signup/register', handler: Signup.register },
{ method: 'POST', path: '/signup/register', handler: Signup.register, config: { plugins: { crumb: false } } },
{ method: 'GET', path: '/i/{id}', handler: Signup.i },
{ method: 'GET', path: '/signup/invite', handler: Signup.invite },
{ method: 'POST', path: '/signup/invite/claim', handler: Signup.claim, config: { auth: { mode: 'required' } } },
{ method: 'GET', path: '/signup/invite/other', handler: Signup.other },
{ method: 'POST', path: '/signup/invite/register', handler: Signup.inviteRegister },
{ method: 'POST', path: '/signup/invite/register', handler: Signup.inviteRegister, config: { plugins: { crumb: false } } },

{ method: 'GET', path: '/welcome', handler: Misc.welcome, config: { auth: { mode: 'required' } } },
{ method: 'GET', path: '/about', handler: Misc.about },
{ method: 'GET', path: '/developer', handler: Misc.developer },
{ method: 'GET', path: '/developer/console', handler: Misc.console, config: { auth: { mode: 'required' } } },
{ method: 'GET', path: '/imwithstupid', handler: Misc.stupid },
{ method: 'GET', path: '/feedback', handler: Misc.feedback },
{ method: 'POST', path: '/feedback', handler: Misc.feedback },
{ method: 'POST', path: '/feedback', handler: Misc.feedback, config: { plugins: { crumb: false } } },

{ method: 'GET', path: '/oz/authorize', handler: Session.ask, config: { auth: { mode: 'required' } } },
{ method: 'POST', path: '/oz/authorize', handler: Session.answer, config: { auth: { mode: 'required' } } },
Expand Down

0 comments on commit c41d44e

Please sign in to comment.