EbookFoundation
/
river-of-ebooks
mirror of https://github.com/EbookFoundation/river-of-ebooks.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

standardify

pull/19/head
unknown 2018-11-07 15:06:36 -05:00
parent 7972729f9e
commit f3d3d8a5a8
58 changed files with 482 additions and 549 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
api/controllers/AuthController.js
View File

@ -11,15 +11,15 @@ module.exports = {
emailExists: async function (req, res) {
const user = await User.findOne({
email: req.param('email')
});
})
if (!user) {
return res.status(404).json({
error: 'user does not exist'
});
})
} else {
return res.json({
status: 'ok'
});
})
}
},
/**
@ -28,15 +28,15 @@ module.exports = {
emailAvailable: async function (req, res) {
const user = await User.findOne({
email: req.param('email')
});
})
if (user) {
return res.status(401).json({
error: 'that email address is not available'
});
})
} else {
return res.json({
status: 'ok'
});
})
}
},
@ -55,15 +55,15 @@ module.exports = {
* @param {Object} res
*/
logout: function (req, res) {
req.logout();
delete req.user;
delete req.session.passport;
req.session.authenticated = false;
req.logout()
delete req.user
delete req.session.passport
req.session.authenticated = false
if (!req.isSocket) {
res.redirect(req.query.next || '/');
res.redirect(req.query.next || '/')
} else {
res.ok();
res.ok()
}
},
@ -74,8 +74,8 @@ module.exports = {
* @param {Object} res
*/
provider: async function (req, res) {
const passportHelper = await sails.helpers.passport();
passportHelper.endpoint(req, res);
const passportHelper = await sails.helpers.passport()
passportHelper.endpoint(req, res)
},
/**
@ -95,51 +95,51 @@ module.exports = {
* @param {Object} res
*/
callback: async function (req, res) {
const action = req.param('action');
const passportHelper = await sails.helpers.passport();
const action = req.param('action')
const passportHelper = await sails.helpers.passport()
function negotiateError (err) {
if (action === 'register') {
res.redirect('/register');
res.redirect('/register')
} else if (action === 'login') {
res.redirect('/login');
res.redirect('/login')
} else if (action === 'disconnect') {
res.redirect('back');
res.redirect('back')
} else {
// make sure the server always returns a response to the client
// i.e passport-local bad username/email or password
res.status(401).json({
'error': err.toString()
});
})
}
}
passportHelper.callback(req, res, (err, user, info, status) => {
if (err || !user) {
sails.log.warn(user, err, info, status);
sails.log.warn(user, err, info, status)
if (!err && info) {
return negotiateError(info);
return negotiateError(info)
}
return negotiateError(err);
return negotiateError(err)
}
req.login(user, (err) => {
if (err) {
sails.log.warn(err);
return negotiateError(err);
sails.log.warn(err)
return negotiateError(err)
}
req.session.authenticated = true;
req.session.authenticated = true
// redirect if there is a 'next' param
if (req.query.next) {
res.status(302).set('Location', req.query.next);
res.status(302).set('Location', req.query.next)
}
sails.log.info('user', user, 'authenticated successfully');
return res.json(user);
});
});
sails.log.info('user', user, 'authenticated successfully')
return res.json(user)
})
})
},
/**
@ -149,7 +149,7 @@ module.exports = {
* @param {Object} res
*/
disconnect: async function (req, res) {
const passportHelper = await sails.helpers.passport();
passportHelper.disconnect(req, res);
const passportHelper = await sails.helpers.passport()
passportHelper.disconnect(req, res)
}
};
}

34
api/controllers/BooksController.js
View File

@ -8,48 +8,48 @@
module.exports = {
publish: async function (req, res) {
try {
const body = req.body;
const host = req.hostname;
let result;
const body = req.body
const host = req.hostname
let result
if (!host) { throw new Error('Missing hostname'); }
if (!body) {throw new Error('Missing body'); }
if (!host) { throw new Error('Missing hostname') }
if (!body) { throw new Error('Missing body') }
const bookExists = await Book.findOne(body);
const bookExists = await Book.findOne(body)
if (bookExists) {
throw new Error('Version already exists');
throw new Error('Version already exists')
} else {
result = await Book.create(body);
result = await Book.create(body)
}
return res.json({
...result
});
})
} catch (e) {
return res.status(400).json({
error: e.message
});
})
}
},
list: async function (req, res) {
try {
const body = req.allParams();
if (!body) { throw new Error('Missing parameters'); }
const body = req.allParams()
if (!body) { throw new Error('Missing parameters') }
const books = await Book.find(body);
const books = await Book.find(body)
if (!books.length) {
return res.status(404).json({
error: 'No books matching those parameters were found.'
});
})
}
return res.json(books);
return res.json(books)
} catch (e) {
return res.status(500).json({
error: e.message
});
})
}
}
};
}

4
api/controllers/TargetController.js
View File

@ -3,6 +3,6 @@ module.exports = {
res.view('pages/temp', {
email: req.user.email
});
})
}
};
}

20
api/controllers/UserController.js
View File

@ -10,31 +10,31 @@ module.exports = {
* @override
*/
create: async function (req, res, next) {
const passportHelper = await sails.helpers.passport();
const passportHelper = await sails.helpers.passport()
passportHelper.protocols.local.register(req.body, (err, user) => {
if (err) {
return res.status(500).json({
error: err.toString() });
error: err.toString() })
}
res.json(user);
});
res.json(user)
})
},
update: async function (req, res, next) {
const passportHelper = await sails.helpers.passport();
const passportHelper = await sails.helpers.passport()
passportHelper.protocols.local.update(req.body, (err, user) => {
if (err) {
return res.status(500).json({
error: err.toString()
});
})
}
res.json(user);
});
res.json(user)
})
},
me: function (req, res) {
res.json(req.user);
res.json(req.user)
}
};
}

142
api/helpers/passport.js
View File

@ -1,7 +1,7 @@
// api/helpers/passport.js
// from https://github.com/trailsjs/sails-auth/blob/master/api/services/passport.js
const url = require('url');
const url = require('url')
module.exports = {
friendlyName: 'Load PassportHelper',
@ -14,158 +14,158 @@ module.exports = {
}
},
fn: async function (inputs, exits) {
return exits.success(new PassportHelper());
return exits.success(new PassportHelper())
}
};
}
const passport = require('passport');
const passport = require('passport')
passport.serializeUser((user, next) => {
next(null, user.id);
});
next(null, user.id)
})
passport.deserializeUser((id, next) => {
return User.findOne({id: id})
.then((user) => {
next(null, user);
return user;
}).catch(next);
});
next(null, user)
return user
}).catch(next)
})
function PassportHelper () {
this.protocols = sails.config.protocols;
this.protocols = sails.config.protocols
this.loadStrategies = function () {
const strategies = sails.config.passport;
const strategies = sails.config.passport
for (const key in strategies) {
let options = {passReqToCallback: true};
let Strategy = strategies[key].strategy;
let options = {passReqToCallback: true}
let Strategy = strategies[key].strategy
if (key === 'local') {
_.extend(options, {
usernameField: 'identifier'
});
passport.use(new Strategy(options, this.protocols.local.login));
})
passport.use(new Strategy(options, this.protocols.local.login))
} else {
const protocol = strategies[key].protocol;
const callbackURL = strategies[key].callback;
let baseURL = '';
const protocol = strategies[key].protocol
const callbackURL = strategies[key].callback
let baseURL = ''
if (sails.config.appUrl && sails.config.appUrl !== null) {
baseURL = sails.config.appUrl;
baseURL = sails.config.appUrl
} else {
sails.log.warn('Please add \'appUrl\' to configuration');
baseURL = sails.getBaseurl();
sails.log.warn('Please add \'appUrl\' to configuration')
baseURL = sails.getBaseurl()
}
switch (protocol) {
case 'oauth2':
options.callbackURL = url.resolve(baseURL, callbackURL);
break;
options.callbackURL = url.resolve(baseURL, callbackURL)
break
// other protocols (openid, etc can go here)
}
_.extend(options, strategies[key].options);
_.extend(options, strategies[key].options)
passport.use(new Strategy(options, this.protocols[protocol].login));
passport.use(new Strategy(options, this.protocols[protocol].login))
}
}
};
}
this.endpoint = function (req, res) {
const strategies = sails.config.passport;
const provider = req.param('provider');
const strategies = sails.config.passport
const provider = req.param('provider')
if (!_.has(strategies, provider)) {return res.redirect('/login');}
if (!_.has(strategies, provider)) { return res.redirect('/login') }
passport.authenticate(provider, {})(req, res, req.next);
};
passport.authenticate(provider, {})(req, res, req.next)
}
// a callback helper to split by req
this.callback = function (req, res, next) {
var provider = req.param('provider', 'local');
var action = req.param('action');
var provider = req.param('provider', 'local')
var action = req.param('action')
if (provider === 'local' && action !== undefined) {
if (action === 'register' && !req.user) {
this.protocols.local.register(req, res, next);
this.protocols.local.register(req, res, next)
} else if (action === 'connect' && req.user) {
this.protocols.local.connect(req, res, next);
this.protocols.local.connect(req, res, next)
} else if (action === 'disconnect' && req.user) {
this.protocols.local.disconnect(req, res, next);
this.protocols.local.disconnect(req, res, next)
} else {
return next(new Error('Invalid action'));
return next(new Error('Invalid action'))
}
} else {
if (action === 'disconnect' && req.user) {
this.disconnect(req, res, next);
this.disconnect(req, res, next)
} else {
passport.authenticate(provider, next)(req, res, req.next);
passport.authenticate(provider, next)(req, res, req.next)
}
}
};
}
this.connect = async function (req, q, profile, next) {
let userAttrs = {};
let provider = profile.provider || req.param('provider');
let userAttrs = {}
let provider = profile.provider || req.param('provider')
req.session.tokens = q.tokens;
q.provider = provider;
req.session.tokens = q.tokens
q.provider = provider
if (!provider) {
return next(new Error('No provider identified'));
return next(new Error('No provider identified'))
}
// if the profile object from passport has an email, use it
if (profile.emails && profile.emails[0]) {userAttrs.email = profile.emails[0].value;}
if (!userAttrs.email) {return next(new Error('No email available'));}
if (profile.emails && profile.emails[0]) { userAttrs.email = profile.emails[0].value }
if (!userAttrs.email) { return next(new Error('No email available')) }
const pass = await Passport.findOne({
provider,
identifier: q.identifier.toString()
});
})
let user;
let user
if (!req.user) {
if (!passport) { // new user signing up, create a new user
user = await User.create(userAttrs).fetch();
user = await User.create(userAttrs).fetch()
await Passport.create({
...q,
user: user.id
});
return next(null, user);
})
return next(null, user)
} else { // existing user logging in
if (_.has(q, 'tokens') && q.tokens !== passport.tokens) {
passport.tokens = q.tokens;
passport.tokens = q.tokens
}
await passport.save();
user = User.findOne(passport.user);
return next(null, user);
await passport.save()
user = User.findOne(passport.user)
return next(null, user)
}
} else { // user logged in and trying to add new Passport
if (!passport) {
await Passport.create({
...q,
user: req.user.id
});
return next(null, req.user);
})
return next(null, req.user)
} else { // no action, user already logged in and passport exists
return next(null, user);
return next(null, user)
}
}
};
}
this.disconnect = async function (req, res, next) {
try {
const user = req.user;
const provider = req.param('provider');
const user = req.user
const provider = req.param('provider')
const pass = Passport.findOne({
provider,
user: user.id
});
await Passport.destroy(pass.id);
next(null, user);
return user;
})
await Passport.destroy(pass.id)
next(null, user)
return user
} catch (e) {
return next(e);
return next(e)
}
};
}
this.getPassport = function () {
return passport;
};
return passport
}
}

15
api/hooks/passport/index.js
View File

@ -1,16 +1,15 @@
let passportHook = sails.hooks.passport;
let passportHook = sails.hooks.passport
if (!passportHook) {
passportHook = function (sails) {
return {
initialize: async function (cb) {
const helper = await sails.helpers.passport();
helper.loadStrategies();
return cb();
const helper = await sails.helpers.passport()
helper.loadStrategies()
return cb()
}
};
};
}
}
}
module.exports = passportHook;
module.exports = passportHook

7
api/models/Book.js
View File

@ -20,17 +20,16 @@ module.exports = {
title: {type: 'string', required: true},
author: {type: 'string'},
isbn: {type: 'string'},
version: {type: 'string'},
version: {type: 'string'}
// ╔═╗╔╦╗╔╗ ╔═╗╔╦╗╔═╗
// ║╣ ║║║╠╩╗║╣ ║║╚═╗
// ╚═╝╩ ╩╚═╝╚═╝═╩╝╚═╝
// ╔═╗╔═╗╔═╗╔═╗╔═╗╦╔═╗╔╦╗╦╔═╗╔╗╔╔═╗
// ╠═╣╚═╗╚═╗║ ║║ ║╠═╣ ║ ║║ ║║║║╚═╗
// ╩ ╩╚═╝╚═╝╚═╝╚═╝╩╩ ╩ ╩ ╩╚═╝╝╚╝╚═╝
},
}
};
}

30
api/models/Passport.js
View File

@ -1,18 +1,18 @@
const bcrypt = require('bcrypt');
const bcrypt = require('bcrypt')
async function hashPassword (passport) {
try {
var config = sails.config.auth.bcrypt;
var salt = config.rounds;
var config = sails.config.auth.bcrypt
var salt = config.rounds
if (passport.password) {
const hash = await bcrypt.hash(passport.password, salt);
passport.password = hash;
const hash = await bcrypt.hash(passport.password, salt)
passport.password = hash
}
return passport;
return passport
} catch (e) {
delete passport.password;
sails.log.error(e);
throw e;
delete passport.password
sails.log.error(e)
throw e
}
}
@ -52,20 +52,20 @@ module.exports = {
* callback run before creating a Passport
*/
beforeCreate: async function (passport, next) {
await hashPassword(passport);
return next();
await hashPassword(passport)
return next()
},
/**
* callback run before updating
*/
beforeUpdate: async function (passport, next) {
await hashPassword(passport);
return next();
await hashPassword(passport)
return next()
},
// methods
validatePassword: async function (password, passport) {
return bcrypt.compare(password, passport.password);
return bcrypt.compare(password, passport.password)
}
};
}

2
api/models/User.js
View File

@ -32,4 +32,4 @@ module.exports = {
}
};
}

6
api/policies/sessionAuth.js
View File

@ -7,8 +7,8 @@
*/
module.exports = function (req, res, next) {
if (req.session.authenticated) {
return next();
return next()
}
res.status(403).json({ error: 'You are not permitted to perform this action.' });
res.status(403).json({ error: 'You are not permitted to perform this action.' })
// res.redirect('/login')
};
}

76
assets/js/actions/login.js
View File

@ -1,6 +1,6 @@
'use strict';
'use strict'
import Ajax from '../lib/Ajax';
import Ajax from '../lib/Ajax'
const ACTIONS = {
set_working: 'set_working',
@ -9,50 +9,50 @@ const ACTIONS = {
set_carousel: 'set_carousel',
set_error: 'set_error',
clear_error: 'clear_error'
};
}
export default ACTIONS;
export default ACTIONS
export const setWorking = working => ({
type: ACTIONS.set_working,
data: working
});
})
export const setEmail = email => ({
type: ACTIONS.set_user,
data: email
});
})
export const setPassword = pass => ({
type: ACTIONS.set_password,
data: pass
});
})
export const setCarousel = pos => (dispatch, getState) => {
dispatch(clearError());
dispatch(clearError())
dispatch({
type: ACTIONS.set_carousel,
data: pos
});
};
})
}
export const setError = data => ({
type: ACTIONS.set_error,
data: data
});
})
export const clearError = () => ({
type: ACTIONS.clear_error
});
})
export const setLoggedIn = (data) => (dispatch, getState) => {
window.localStorage.setItem('roe-token', JSON.stringify(data));
window.location.href = '/app';
};
window.localStorage.setItem('roe-token', JSON.stringify(data))
window.location.href = '/app'
}
export const checkEmail = email => async (dispatch, getState) => {
dispatch(setWorking(true));
dispatch(clearError());
dispatch(setWorking(true))
dispatch(clearError())
if (/^([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5})$/.test(email)) {
try {
const res = await Ajax.post({
@ -60,25 +60,25 @@ export const checkEmail = email => async (dispatch, getState) => {
data: {
email
}
});
dispatch(setCarousel(2));
})
dispatch(setCarousel(2))
} catch (e) {
dispatch(setError({
type: 'email',
error: 'An account with that email does not exist.'
}));
}))
}
} else {
dispatch(setError({
type: 'email',
error: 'Please enter a valid email address.'
}));
}))
}
dispatch(setWorking(false));
};
dispatch(setWorking(false))
}
export const checkPassword = (email, password) => async (dispatch, getState) => {
dispatch(setWorking(true));
dispatch(setWorking(true))
// do email + password check
try {
@ -88,21 +88,21 @@ export const checkPassword = (email, password) => async (dispatch, getState) =>
identifier: email,
password
}
});
dispatch(setLoggedIn(res));
})
dispatch(setLoggedIn(res))
// dispatch(setWorking(false))
} catch (e) {
dispatch(setError({
type: 'password',
error: e.toString()
}));
dispatch(setWorking(false));
}))
dispatch(setWorking(false))
}
};
}
export const signup = (email, password) => async (dispatch, getState) => {
dispatch(setWorking(true));
dispatch(clearError());
dispatch(setWorking(true))
dispatch(clearError())
if (/^([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5})$/.test(email)) {
try {
await Ajax.post({
@ -110,26 +110,26 @@ export const signup = (email, password) => async (dispatch, getState) => {
data: {
email
}
});
})
await Ajax.post({
url: '/register',
data: {
email,
password
}
});
dispatch(setCarousel(2));
})
dispatch(setCarousel(2))
} catch (e) {
dispatch(setError({
type: 'email',
error: e.toString()
}));
}))
}
} else {
dispatch(setError({
type: 'email',
error: 'Please enter a valid email address.'
}));
}))
}
dispatch(setWorking(false));
};
dispatch(setWorking(false))
}

4
assets/js/components/Progress.js
View File

@ -1,6 +1,6 @@
'use strict';
'use strict'
import React from 'react';
import React from 'react'
const Progress = props => (
<div className={'progress' + (props.bound ? ' bound' : '')}>

168
assets/js/lib/Ajax.js
View File

@ -1,162 +1,162 @@
/* global XMLHttpRequest FormData */
'use strict';
'use strict'
let ajaxcfg = {};
let ajaxcfg = {}
class AjaxError extends Error {
constructor (reason, data, xhr) {
super(reason);
this.data = data;
this.xhr = xhr;
super(reason)
this.data = data
this.xhr = xhr
}
}
export default class Ajax {
static async get (opts) {
if (!opts) {opts = {};}
opts.method = 'get';
return Ajax.ajax(opts);
if (!opts) { opts = {} }
opts.method = 'get'
return Ajax.ajax(opts)
}
static async post (opts) {
if (!opts) {opts = {};}
opts.method = 'post';
return Ajax.ajax(opts);
if (!opts) { opts = {} }
opts.method = 'post'
return Ajax.ajax(opts)
}
static async put (opts) {
if (!opts) {opts = {};}
opts.method = 'put';
return Ajax.ajax(opts);
if (!opts) { opts = {} }
opts.method = 'put'
return Ajax.ajax(opts)
}
static async patch (opts) {
if (!opts) {opts = {};}
opts.method = 'patch';
return Ajax.ajax(opts);
if (!opts) { opts = {} }
opts.method = 'patch'
return Ajax.ajax(opts)
}
static async delete (opts) {
if (!opts) {opts = {};}
opts.method = 'delete';
return Ajax.ajax(opts);
if (!opts) { opts = {} }
opts.method = 'delete'
return Ajax.ajax(opts)
}
static async head (opts) {
if (!opts) {opts = {};}
opts.method = 'head';
return Ajax.ajax(opts);
if (!opts) { opts = {} }
opts.method = 'head'
return Ajax.ajax(opts)
}
static async options (opts) {
if (!opts) {opts = {};}
opts.method = 'options';
return Ajax.ajax(opts);
if (!opts) { opts = {} }
opts.method = 'options'
return Ajax.ajax(opts)
}
static ajax (opts) {
return new Promise((resolve, reject) => {
if (!opts) {reject(new Error('Missing required options parameter.'));}
if (!opts) { reject(new Error('Missing required options parameter.')) }
if (opts.method) {
if (!['get', 'post', 'put', 'patch', 'delete', 'head', 'options'].includes(opts.method.toLowerCase())) {reject(new Error('opts.method must be one of: GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS.'));}
opts.method = opts.method.toUpperCase();
if (!['get', 'post', 'put', 'patch', 'delete', 'head', 'options'].includes(opts.method.toLowerCase())) { reject(new Error('opts.method must be one of: GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS.')) }
opts.method = opts.method.toUpperCase()
}
var xhr = opts.xhr || new XMLHttpRequest();
var xhr = opts.xhr || new XMLHttpRequest()
var fd = null;
var qs = '';
var fd = null
var qs = ''
if (opts.data && opts.method.toLowerCase() !== 'get') {
fd = new FormData();
fd = new FormData()
for (let key in opts.data) {
fd.append(key, opts.data[key]);
fd.append(key, opts.data[key])
}
} else if (opts.data) {
qs += '?';
let params = [];
qs += '?'
let params = []
for (let key in opts.data) {
params.push([key, opts.data[key]].join('='));
params.push([key, opts.data[key]].join('='))
}
qs += params.join('&');
qs += params.join('&')
}
xhr.onload = () => {
if (xhr.status !== 200) {return xhr.onerror();}
var data = xhr.response;
if (xhr.status !== 200) { return xhr.onerror() }
var data = xhr.response
resolve({
data,
xhr
});
};
})
}
xhr.onerror = () => {
var data = xhr.response;
var data = xhr.response
// method not allowed
if (xhr.status === 405) {
reject(new AjaxError('405 Method Not Allowed', data, xhr));
return;
reject(new AjaxError('405 Method Not Allowed', data, xhr))
return
} else if (xhr.status === 404) {
reject(new AjaxError('404 Not Found', data, xhr));
return;
reject(new AjaxError('404 Not Found', data, xhr))
return
}
try {
// if the access token is invalid, try to use the refresh token
var json = JSON.parse(data);
var json = JSON.parse(data)
if (json.error === 'access_denied' && json.hint.includes('token') && json.hint.includes('invalid') && ajaxcfg.refresh_token) {
return Ajax.refresh(opts);
return Ajax.refresh(opts)
} else if (json.error === 'access_denied' && json.hint.includes('token') && json.hint.includes('revoked')) {
reject(new AjaxError('token revoked', data, xhr));
reject(new AjaxError('token revoked', data, xhr))
}
} catch (e) {
reject(new AjaxError(e.toString(), data, xhr));
reject(new AjaxError(e.toString(), data, xhr))
} finally {
reject(new AjaxError(data, xhr.status, xhr));
reject(new AjaxError(data, xhr.status, xhr))
}
};
xhr.open(opts.method || 'GET', opts.url + qs || window.location.href);
if (opts.headers) {
for (let key in opts.headers) {xhr.setRequestHeader(key, opts.headers[key]);}
}
if (ajaxcfg.access_token && !(opts.headers || {}).Authorization) {xhr.setRequestHeader('Authorization', 'Bearer ' + ajaxcfg.access_token);}
xhr.send(fd);
});
xhr.open(opts.method || 'GET', opts.url + qs || window.location.href)
if (opts.headers) {
for (let key in opts.headers) { xhr.setRequestHeader(key, opts.headers[key]) }
}
if (ajaxcfg.access_token && !(opts.headers || {}).Authorization) { xhr.setRequestHeader('Authorization', 'Bearer ' + ajaxcfg.access_token) }
xhr.send(fd)
})
}
static refresh (opts) {
return new Promise((resolve, reject) => {
var xhr = new XMLHttpRequest();
var xhr = new XMLHttpRequest()
var fd = new FormData();
var fd = new FormData()
const OAUTH_TOKEN_REQUEST = {
grant_type: 'refresh_token',
refresh_token: ajaxcfg.refresh_token,
client_id: 'foxfile',
client_secret: 1
};
}
for (var key in OAUTH_TOKEN_REQUEST) {
fd.append(key, OAUTH_TOKEN_REQUEST[key]);
fd.append(key, OAUTH_TOKEN_REQUEST[key])
}
// try original request
xhr.onload = () => {
if (xhr.status !== 200) {return xhr.onerror();}
if (ajaxcfg.refresh) {ajaxcfg.refresh(xhr.response);}
var json = JSON.parse(xhr.response);
ajaxcfg.access_token = json.access_token;
ajaxcfg.refresh_token = json.refresh_token;
return Ajax.ajax(opts);
};
if (xhr.status !== 200) { return xhr.onerror() }
if (ajaxcfg.refresh) { ajaxcfg.refresh(xhr.response) }
var json = JSON.parse(xhr.response)
ajaxcfg.access_token = json.access_token
ajaxcfg.refresh_token = json.refresh_token
return Ajax.ajax(opts)
}
// if this fails, dont try again
xhr.onerror = () => {
var data = xhr.response;
reject(new AjaxError(xhr.status, data, xhr));
};
xhr.open('POST', ajaxcfg.refresh_url);
xhr.send(fd);
});
var data = xhr.response
reject(new AjaxError(xhr.status, data, xhr))
}
xhr.open('POST', ajaxcfg.refresh_url)
xhr.send(fd)
})
}
static setTokenData (tokens) {
if (!tokens) {throw new Error('Missing tokens.');}
if (!tokens.access_token && !tokens.refresh_token && !tokens.refresh_url) {throw new Error('Missing at least one of: access_token, refresh_token, refresh_url.');}
if (tokens.access_token) {ajaxcfg.access_token = tokens.access_token;}
if (tokens.refresh_token) {ajaxcfg.refresh_token = tokens.refresh_token;}
if (tokens.refresh_url) {ajaxcfg.refresh_url = tokens.refresh_url;}
return true;
if (!tokens) { throw new Error('Missing tokens.') }
if (!tokens.access_token && !tokens.refresh_token && !tokens.refresh_url) { throw new Error('Missing at least one of: access_token, refresh_token, refresh_url.') }
if (tokens.access_token) { ajaxcfg.access_token = tokens.access_token }
if (tokens.refresh_token) { ajaxcfg.refresh_token = tokens.refresh_token }
if (tokens.refresh_url) { ajaxcfg.refresh_url = tokens.refresh_url }
return true
}
static onRefresh (func) {
ajaxcfg.refresh = func;
ajaxcfg.refresh = func
}
}

26
assets/js/reducers/login.js
View File

@ -1,9 +1,9 @@
'use strict';
'use strict'
import Actions from '../actions/login';
import Actions from '../actions/login'
const reducer = (state = {}, action) => {
const {type, data} = action;
const {type, data} = action
switch (type) {
case Actions.set_user:
return {
@ -11,40 +11,40 @@ const reducer = (state = {}, action) => {
...state.user,
email: data
}
};
}
case Actions.set_password:
return {
user: {
...state.user,
password: data
}
};
}
case Actions.set_carousel:
return {
carouselPosition: data
};
}
case Actions.set_working:
return {
working: data
};
}
case Actions.set_error:
switch (data.type) {
case 'email':
return {
emailError: data.error
};
}
case 'password':
return {
passwordError: data.error
};
default: return {};
}
default: return {}
}
case Actions.clear_error:
return {
emailError: '',
passwordError: ''
};
}
}
};
}
export default reducer;
export default reducer

2
config/auth.js
View File

@ -2,4 +2,4 @@ module.exports.auth = {
bcrypt: {
rounds: 8
}
};
}

4
config/blueprints.js
View File

@ -19,7 +19,6 @@ module.exports.blueprints = {
// actions: false,
/***************************************************************************
* *
* Automatically expose RESTful routes for your models? *
@ -28,7 +27,6 @@ module.exports.blueprints = {
// rest: true,
/***************************************************************************
* *
* Automatically expose CRUD "shortcut" routes to GET requests? *
@ -38,4 +36,4 @@ module.exports.blueprints = {
// shortcuts: true,
};
}

8
config/bootstrap.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/config/bootstrap
*/
module.exports.bootstrap = async function(done) {
module.exports.bootstrap = async function (done) {
// By convention, this is a good place to set up fake data during development.
//
// For example:
@ -29,6 +28,5 @@ module.exports.bootstrap = async function(done) {
// Don't forget to trigger `done()` when this bootstrap function's logic is finished.
// (otherwise your server will never lift, since it's waiting on the bootstrap)
return done();
};
return done()
}

2
config/custom.js
View File

@ -20,4 +20,4 @@ module.exports.custom = {
// stripeSecret: 'sk_test_Zzd814nldl91104qor5911gjald',
// …
};
}

6
config/datastores.js
View File

@ -15,7 +15,6 @@
module.exports.datastores = {
/***************************************************************************
* *
* Your app's default datastore. *
@ -51,7 +50,6 @@ module.exports.datastores = {
// adapter: 'sails-mysql',
// url: 'mysql://user:password@host:port/database',
},
}
};
}

2
config/env/development.js vendored
View File

@ -367,4 +367,4 @@ module.exports = {
}
};
}

6
config/env/production.js vendored
View File

@ -238,8 +238,8 @@ module.exports = {
* *
***************************************************************************/
onlyAllowOrigins: [
'https://ec2-18-219-76-43.us-east-2.compute.amazonaws.com',
],
'https://ec2-18-219-76-43.us-east-2.compute.amazonaws.com'
]
/***************************************************************************
* *
@ -366,4 +366,4 @@ module.exports = {
}
};
}

4
config/globals.js
View File

@ -47,6 +47,6 @@ module.exports.globals = {
* *
****************************************************************************/
sails: true,
sails: true
};
}

10
config/http.js
View File

@ -9,14 +9,14 @@
* https://sailsjs.com/config/http
*/
const rateLimit = require('express-rate-limit');
const rateLimit = require('express-rate-limit')
const rateLimiter = rateLimit({
windowMs: 10 * 60 * 1000, // 10 minutes
max: 100, // limit each IP to 100 requests per windowMs
skip (req, res) {
return !req.path.startsWith('/api');
return !req.path.startsWith('/api')
}
});
})
module.exports.http = {
@ -53,7 +53,7 @@ module.exports.http = {
],
rateLimit: rateLimiter,
passportInit: require('passport').initialize(),
passportSession: require('passport').session(),
passportSession: require('passport').session()
/***************************************************************************
* *
@ -69,4 +69,4 @@ module.exports.http = {
// return middlewareFn;
// })(),
}
};
}

4
config/i18n.js
View File

@ -20,7 +20,7 @@ module.exports.i18n = {
* *
***************************************************************************/
locales: ['en', 'es', 'fr', 'de'],
locales: ['en', 'es', 'fr', 'de']
/****************************************************************************
* *
@ -42,4 +42,4 @@ module.exports.i18n = {
// localesDirectory: 'config/locales'
};
}

2
config/log.js
View File

@ -26,4 +26,4 @@ module.exports.log = {
// level: 'info'
};
}

18
config/models.js
View File

@ -15,7 +15,6 @@
module.exports.models = {
/***************************************************************************
* *
* Whether the `.create()` and `.update()` model methods should ignore *
@ -37,7 +36,6 @@ module.exports.models = {
// schema: true,
/***************************************************************************
* *
* How and whether Sails will attempt to automatically rebuild the *
@ -55,7 +53,6 @@ module.exports.models = {
// migrate: 'alter',
/***************************************************************************
* *
* Base attributes that are included in all of your models by default. *
@ -69,10 +66,10 @@ module.exports.models = {
***************************************************************************/
attributes: {
createdAt: { type: 'number', autoCreatedAt: true, },
updatedAt: { type: 'number', autoUpdatedAt: true, },
id: { type: 'number', autoIncrement: true, },
//--------------------------------------------------------------------------
createdAt: { type: 'number', autoCreatedAt: true },
updatedAt: { type: 'number', autoUpdatedAt: true },
id: { type: 'number', autoIncrement: true }
// --------------------------------------------------------------------------
// /\ Using MongoDB?
// || Replace `id` above with this instead:
//
@ -82,10 +79,9 @@ module.exports.models = {
//
// Plus, don't forget to configure MongoDB as your default datastore:
// https://sailsjs.com/docs/tutorials/using-mongo-db
//--------------------------------------------------------------------------
// --------------------------------------------------------------------------
},
/******************************************************************************
* *
* The set of DEKs (data encryption keys) for at-rest encryption. *
@ -104,7 +100,6 @@ module.exports.models = {
default: 'nuF29j3StsGhRTut9dIrCxCNyYegcwH30FxnZ3kkdiA='
},
/***************************************************************************
* *
* Whether or not implicit records for associations should be cleaned up *
@ -120,5 +115,4 @@ module.exports.models = {
cascadeOnDestroy: true
};
}

2
config/passport.js
View File

@ -6,4 +6,4 @@ module.exports.passport = {
local: {
strategy: require('passport-local').Strategy
}
};
}

2
config/policies.js
View File

@ -34,4 +34,4 @@ module.exports.policies = {
TargetController: {
'*': [ 'sessionAuth' ]
}
};
}

64
config/protocols.js
View File

@ -1,6 +1,6 @@
// Passport protocol configurations
const crypto = require('crypto');
const base64URL = require('base64url');
const crypto = require('crypto')
const base64URL = require('base64url')
module.exports.protocols = {
local: {
@ -18,87 +18,87 @@ module.exports.protocols = {
*/
login: async function (req, identifier, password, next) {
if (!validateEmail(identifier)) {
return next(new Error('invalid email address'), false);
return next(new Error('invalid email address'), false)
}
try {
const user = await User.findOne({
email: identifier
});
if (!user) {throw new Error('an account with that email was not found');}
})
if (!user) { throw new Error('an account with that email was not found') }
const passport = await Passport.findOne({
protocol: 'local',
user: user.id
});
})
if (passport) {
const res = await Passport.validatePassword(password, passport);
if (!res) {throw new Error('incorrect password');}
return next(null, user);
const res = await Passport.validatePassword(password, passport)
if (!res) { throw new Error('incorrect password') }
return next(null, user)
} else {
throw new Error('that account does not have password login enabled');
throw new Error('that account does not have password login enabled')
}
} catch (e) {
return next(e, false);
return next(e, false)
}
},
register: async function (user, next) {
try {
const token = generateToken();
const password = user.password;
if (!password.length) {throw new Error('password cannot be blank');}
delete user.password;
const token = generateToken()
const password = user.password
if (!password.length) { throw new Error('password cannot be blank') }
delete user.password
const newUser = await User.create(user).fetch();
const newUser = await User.create(user).fetch()
try {
await Passport.create({
protocol: 'local',
password,
user: newUser.id,
accessToken: token
});
return next(null, token);
})
return next(null, token)
} catch (e) {
await User.destroy(newUser.id);
throw e;
await User.destroy(newUser.id)
throw e
}
} catch (e) {
return next(e);
return next(e)
}
},
update: async function (user, next) {
throw new Error('not implemented');
throw new Error('not implemented')
},
connect: async function (req, res, next) {
try {
const user = req.user;
const password = req.param('password');
const user = req.user
const password = req.param('password')
const pass = await Passport.findOne({
protocol: 'local',
user: user.id
});
})
if (!pass) {
await Passport.create({
protocol: 'local',
password,
user: user.id
});
})
} else {
return next(null, user);
return next(null, user)
}
} catch (e) {
return next(e);
return next(e)
}
}
}
};
}
const EMAIL_REGEX = /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i;
const EMAIL_REGEX = /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i
function validateEmail (email) {
return EMAIL_REGEX.test(email);
return EMAIL_REGEX.test(email)
}
function generateToken () {
return base64URL(crypto.randomBytes(48));
return base64URL(crypto.randomBytes(48))
}

7
config/routes.js
View File

@ -66,17 +66,14 @@ module.exports.routes = {
'POST /api/publish': 'BooksController.publish',
'GET /api/books': 'BooksController.list',
'GET /api/me': 'UserController.me',
'GET /api/me': 'UserController.me'
// ╦ ╦╔═╗╔╗ ╦ ╦╔═╗╔═╗╦╔═╔═╗
// ║║║║╣ ╠╩╗╠═╣║ ║║ ║╠╩╗╚═╗
// ╚╩╝╚═╝╚═╝╩ ╩╚═╝╚═╝╩ ╩╚═╝
// ╔╦╗╦╔═╗╔═╗
// ║║║║╚═╗║
// ╩ ╩╩╚═╝╚═╝
};
}

3
config/security.js
View File

@ -34,7 +34,6 @@ module.exports.security = {
// allowCredentials: false,
// },
/****************************************************************************
* *
* By default, Sails' built-in CSRF protection is disabled to facilitate *
@ -51,4 +50,4 @@ module.exports.security = {
// csrf: false
};
}

5
config/session.js
View File

@ -18,8 +18,7 @@ module.exports.session = {
* of your users, forcing them to log in again. *
* *
***************************************************************************/
secret: 'b7f0374251c4d79227067c286fe97ea5',
secret: 'b7f0374251c4d79227067c286fe97ea5'
/***************************************************************************
* *
@ -36,4 +35,4 @@ module.exports.session = {
// return !!req.path.match(req._sails.LOOKS_LIKE_ASSET_RX);
// },
};
}

6
config/sockets.js
View File

@ -29,7 +29,6 @@ module.exports.sockets = {
// transports: [ 'websocket' ],
/***************************************************************************
* *
* `beforeConnect` *
@ -50,7 +49,6 @@ module.exports.sockets = {
//
// },
/***************************************************************************
* *
* `afterDisconnect` *
@ -68,7 +66,6 @@ module.exports.sockets = {
//
// },
/***************************************************************************
* *
* Whether to expose a 'GET /__getcookie' route that sets an HTTP-only *
@ -78,5 +75,4 @@ module.exports.sockets = {
// grant3rdPartyCookie: true,
};
}

2
config/views.js
View File

@ -38,4 +38,4 @@ module.exports.views = {
layout: 'layouts/layout'
};
}

8
tasks/config/babel.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/babel.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('babel', {
dist: {
options: {
@ -25,7 +24,7 @@ module.exports = function(grunt) {
}
]
}
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -50,5 +49,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-babel');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

8
tasks/config/clean.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/clean.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('clean', {
dev: ['.tmp/public/**'],
build: ['www'],
@ -23,7 +22,7 @@ module.exports = function(grunt) {
'www/templates',
'www/dependencies'
]
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -48,5 +47,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-clean');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

8
tasks/config/coffee.js
View File

@ -10,8 +10,7 @@
* https://sailsjs.com/anatomy/tasks/config/coffee.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('coffee', {
dev: {
options: {
@ -27,7 +26,7 @@ module.exports = function(grunt) {
ext: '.js'
}]
}
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -52,5 +51,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-coffee');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

8
tasks/config/concat.js
View File

@ -10,8 +10,7 @@
* https://sailsjs.com/anatomy/tasks/config/concat.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('concat', {
js: {
src: require('../pipeline').jsFilesToInject,
@ -21,7 +20,7 @@ module.exports = function(grunt) {
src: require('../pipeline').cssFilesToInject,
dest: '.tmp/public/concat/production.css'
}
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -46,5 +45,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-concat');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

10
tasks/config/copy.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/copy.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('copy', {
dev: {
files: [{
@ -35,8 +34,8 @@ module.exports = function(grunt) {
src: ['**/*'],
dest: '.tmp/public/dist'
}]
},
});
}
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -61,5 +60,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-copy');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

8
tasks/config/cssmin.js
View File

@ -11,14 +11,13 @@
* https://sailsjs.com/anatomy/tasks/config/cssmin.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('cssmin', {
dist: {
src: ['.tmp/public/concat/production.css'],
dest: '.tmp/public/min/production.min.css'
}
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -43,5 +42,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-cssmin');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

14
tasks/config/hash.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/hash.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('hash', {
options: {
mapping: '',
@ -18,11 +17,11 @@ module.exports = function(grunt) {
destBasePath: '',
flatten: false,
hashLength: 8,
hashFunction: function(source, encoding){
hashFunction: function (source, encoding) {
if (!source || !encoding) {
throw new Error('Consistency violation: Cannot compute unique hash for production .css/.js cache-busting suffix, because `source` and/or `encoding` are falsey-- but they should be truthy strings! Here they are, respectively:\nsource: '+require('util').inspect(source, {depth:null})+'\nencoding: '+require('util').inspect(encoding, {depth:null}));
throw new Error('Consistency violation: Cannot compute unique hash for production .css/.js cache-busting suffix, because `source` and/or `encoding` are falsey-- but they should be truthy strings! Here they are, respectively:\nsource: ' + require('util').inspect(source, {depth: null}) + '\nencoding: ' + require('util').inspect(encoding, {depth: null}))
}
return require('crypto').createHash('sha1').update(source, encoding).digest('hex');
return require('crypto').createHash('sha1').update(source, encoding).digest('hex')
}
},
js: {
@ -33,7 +32,7 @@ module.exports = function(grunt) {
src: '.tmp/public/min/*.css',
dest: '.tmp/public/hash/'
}
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -58,5 +57,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-hash');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

9
tasks/config/jst.js
View File

@ -10,8 +10,7 @@
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('jst', {
dev: {
@ -26,14 +25,13 @@ module.exports = function(grunt) {
// default interpolation. If you want to parse templates with the default _.template behavior
// (i.e. using <div><%= this.id %></div>), there's no need to overwrite `templateSettings.interpolate`.
files: {
// e.g.
// 'relative/path/from/gruntfile/to/compiled/template/destination' : ['relative/path/to/sourcefiles/**/*.html']
'.tmp/public/jst.js': require('../pipeline').templateFilesToInject
}
}
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -58,5 +56,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-jst');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

8
tasks/config/less.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/less.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('less', {
dev: {
files: [{
@ -21,7 +20,7 @@ module.exports = function(grunt) {
ext: '.css'
}]
}
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -46,5 +45,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-less');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

23
tasks/config/sails-linker.js
View File

@ -11,11 +11,9 @@
* https://sailsjs.com/anatomy/tasks/config/sails-linker.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('sails-linker', {
// ╦╔═╗╦ ╦╔═╗╔═╗╔═╗╦═╗╦╔═╗╔╦╗
// ║╠═╣╚╗╔╝╠═╣╚═╗║ ╠╦╝║╠═╝ ║
// ╚╝╩ ╩ ╚╝ ╩ ╩╚═╝╚═╝╩╚═╩╩ ╩
@ -41,7 +39,7 @@ module.exports = function(grunt) {
startTag: '<!--SCRIPTS-->',
endTag: '<!--SCRIPTS END-->',
fileTmpl: '<script src="%s"></script>',
appRoot: '.tmp/public',
appRoot: '.tmp/public'
// relative: true
// ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc.
// (but be note that this can break custom font URLs)
@ -72,7 +70,7 @@ module.exports = function(grunt) {
startTag: '<!--SCRIPTS-->',
endTag: '<!--SCRIPTS END-->',
fileTmpl: '<script src="%s"></script>',
appRoot: '.tmp/public',
appRoot: '.tmp/public'
// relative: true
// ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc.
// (but be note that this can break custom font URLs)
@ -84,7 +82,6 @@ module.exports = function(grunt) {
}
},
// ╔═╗╔╦╗╦ ╦╦ ╔═╗╔═╗╦ ╦╔═╗╔═╗╔╦╗╔═╗
// ╚═╗ ║ ╚╦╝║ ║╣ ╚═╗╠═╣║╣ ║╣ ║ ╚═╗
// ╚═╝ ╩ ╩ ╩═╝╚═╝╚═╝╩ ╩╚═╝╚═╝ ╩ ╚═╝
@ -111,7 +108,7 @@ module.exports = function(grunt) {
startTag: '<!--STYLES-->',
endTag: '<!--STYLES END-->',
fileTmpl: '<link rel="stylesheet" href="%s">',
appRoot: '.tmp/public',
appRoot: '.tmp/public'
// relative: true
// ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc.
// (but be note that this can break custom font URLs)
@ -143,7 +140,7 @@ module.exports = function(grunt) {
startTag: '<!--STYLES-->',
endTag: '<!--STYLES END-->',
fileTmpl: '<link rel="stylesheet" href="%s">',
appRoot: '.tmp/public',
appRoot: '.tmp/public'
// relative: true
// ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc.
// (but be note that this can break custom font URLs)
@ -155,7 +152,6 @@ module.exports = function(grunt) {
}
},
// ╔═╗╦═╗╔═╗╔═╗╔═╗╔╦╗╔═╗╦╦ ╔═╗╔╦╗ ╦ ╦╔╦╗╔╦╗╦ ╔╦╗╔═╗╔╦╗╔═╗╦ ╔═╗╔╦╗╔═╗╔═╗
// ╠═╝╠╦╝║╣ ║ ║ ║║║║╠═╝║║ ║╣ ║║ ╠═╣ ║ ║║║║ ║ ║╣ ║║║╠═╝║ ╠═╣ ║ ║╣ ╚═╗
// ╩ ╩╚═╚═╝╚═╝╚═╝╩ ╩╩ ╩╩═╝╚═╝═╩╝ ╩ ╩ ╩ ╩ ╩╩═╝ ╩ ╚═╝╩ ╩╩ ╩═╝╩ ╩ ╩ ╚═╝╚═╝
@ -180,7 +176,7 @@ module.exports = function(grunt) {
startTag: '<!--TEMPLATES-->',
endTag: '<!--TEMPLATES END-->',
fileTmpl: '<script type="text/javascript" src="%s"></script>',
appRoot: '.tmp/public',
appRoot: '.tmp/public'
// relative: true
// ^^ Uncomment this if compiling assets for use in PhoneGap, CDN, etc.
// (but be note that this can break custom font URLs)
@ -190,9 +186,9 @@ module.exports = function(grunt) {
'views/**/*.html': ['.tmp/public/jst.js'],
'views/**/*.ejs': ['.tmp/public/jst.js']
}
},
}
});//</ grunt.config.set() >
})// </ grunt.config.set() >
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -217,5 +213,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-sails-linker');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

8
tasks/config/sync.js
View File

@ -10,8 +10,7 @@
* https://sailsjs.com/anatomy/tasks/config/sync.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('sync', {
dev: {
files: [{
@ -20,7 +19,7 @@ module.exports = function(grunt) {
dest: '.tmp/public'
}]
}
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -45,5 +44,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-sync');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

11
tasks/config/uglify.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/uglify.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('uglify', {
dist: {
src: ['.tmp/public/concat/production.js'],
@ -24,7 +23,7 @@ module.exports = function(grunt) {
'Promise',
'File',
'Location',
'RttcRefPlaceholder',
'RttcRefPlaceholder'
],
keep_fnames: true//eslint-disable-line
},
@ -32,7 +31,7 @@ module.exports = function(grunt) {
keep_fnames: true//eslint-disable-line
}
}
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -57,6 +56,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-uglify');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

8
tasks/config/watch.js
View File

@ -9,8 +9,7 @@
* https://sailsjs.com/anatomy/tasks/config/watch.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.config.set('watch', {
assets: {
@ -27,7 +26,7 @@ module.exports = function(grunt) {
'linkAssets'
]
}
});
})
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// This Grunt plugin is part of the default asset pipeline in Sails,
@ -52,5 +51,4 @@ module.exports = function(grunt) {
// grunt.loadNpmTasks('grunt-contrib-watch');
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
};
}

38
tasks/pipeline.js
View File

@ -10,8 +10,6 @@
* https://sailsjs.com/anatomy/tasks/pipeline.js
*/
// ██████╗ ██╗ █████╗ ██╗███╗ ██╗ ██████╗███████╗███████╗
// ██╔══██╗██║ ██╔══██╗██║████╗ ██║ ██╔════╝██╔════╝██╔════╝
// ██████╔╝██║ ███████║██║██╔██╗ ██║ ██║ ███████╗███████╗
@ -40,8 +38,7 @@ var cssFilesToInject = [
// in no particular order. To customize the ordering, add additional
// items here, _above_ this one.
'styles/**/*.css'
];
]
// ██████╗██╗ ██╗███████╗███╗ ██╗████████╗ ███████╗██╗██████╗ ███████╗
// ██╔════╝██║ ██║██╔════╝████╗ ██║╚══██╔══╝ ██╔════╝██║██╔══██╗██╔════╝
@ -73,8 +70,7 @@ var jsFilesToInject = [
// in no particular order. To customize the ordering, add additional items
// here, _above_ this one.
'js/**/*.js'
];
]
// ██████╗██╗ ██╗███████╗███╗ ██╗████████╗ ███████╗██╗██████╗ ███████╗
// ██╔════╝██║ ██║██╔════╝████╗ ██║╚══██╔══╝ ██╔════╝██║██╔══██╗██╔════╝
@ -103,9 +99,7 @@ var jsFilesToInject = [
//
var templateFilesToInject = [
'templates/**/*.html'
];
]
// ███╗ ███╗██╗███████╗ ██████╗ ███████╗███████╗████████╗██╗ ██╗██████╗
// ████╗ ████║██║██╔════╝██╔════╝ ██╔════╝██╔════╝╚══██╔══╝██║ ██║██╔══██╗
@ -119,29 +113,29 @@ var templateFilesToInject = [
// the code below, unless you are modifying the default asset pipeline.**
// Default path for public folder (see documentation on sailsjs.com for more information)
var tmpPath = '.tmp/public/';
var tmpPath = '.tmp/public/'
// Prefix relative paths to source files so they point to the proper locations
// (i.e. where the other Grunt tasks spit them out, or in some cases, where
// they reside in the first place)
module.exports.cssFilesToInject = cssFilesToInject.map((cssPath)=>{
module.exports.cssFilesToInject = cssFilesToInject.map((cssPath) => {
// If we're ignoring the file, make sure the ! is at the beginning of the path
if (cssPath[0] === '!') {
return require('path').join('!' + tmpPath, cssPath.substr(1));
return require('path').join('!' + tmpPath, cssPath.substr(1))
}
return require('path').join(tmpPath, cssPath);
});
module.exports.jsFilesToInject = jsFilesToInject.map((jsPath)=>{
return require('path').join(tmpPath, cssPath)
})
module.exports.jsFilesToInject = jsFilesToInject.map((jsPath) => {
// If we're ignoring the file, make sure the ! is at the beginning of the path
if (jsPath[0] === '!') {
return require('path').join('!' + tmpPath, jsPath.substr(1));
return require('path').join('!' + tmpPath, jsPath.substr(1))
}
return require('path').join(tmpPath, jsPath);
});
module.exports.templateFilesToInject = templateFilesToInject.map((tplPath)=>{
return require('path').join(tmpPath, jsPath)
})
module.exports.templateFilesToInject = templateFilesToInject.map((tplPath) => {
// If we're ignoring the file, make sure the ! is at the beginning of the path
if (tplPath[0] === '!') {
return require('path').join('!assets/', tplPath.substr(1));
return require('path').join('!assets/', tplPath.substr(1))
}
return require('path').join('assets/', tplPath);
});
return require('path').join('assets/', tplPath)
})

6
tasks/register/build.js
View File

@ -10,7 +10,7 @@
* https://sailsjs.com/anatomy/tasks/register/build.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.registerTask('build', [
// 'polyfill:dev', //« uncomment to ALSO transpile during development (for broader browser compat.)
'compileAssets',
@ -18,5 +18,5 @@ module.exports = function(grunt) {
'linkAssetsBuild',
'clean:build',
'copy:build'
]);
};
])
}

15
tasks/register/buildProd.js
View File

@ -11,20 +11,19 @@
* https://sailsjs.com/anatomy/tasks/register/build-prod.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.registerTask('buildProd', [
'polyfill:prod', //« Remove this to skip transpilation in production (not recommended)
'polyfill:prod', // « Remove this to skip transpilation in production (not recommended)
'compileAssets',
'babel', //« Remove this to skip transpilation in production (not recommended)
'babel', // « Remove this to skip transpilation in production (not recommended)
'concat',
'uglify',
'cssmin',
'hash',//« Cache-busting
'copy:beforeLinkBuildProd',//« For prettier URLs after cache-busting
'hash', // « Cache-busting
'copy:beforeLinkBuildProd', // « For prettier URLs after cache-busting
'linkAssetsBuildProd',
'clean:build',
'copy:build',
'clean:afterBuildProd'
]);
};
])
}

6
tasks/register/compileAssets.js
View File

@ -7,12 +7,12 @@
* https://sailsjs.com/anatomy/tasks/register/compile-assets.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.registerTask('compileAssets', [
'clean:dev',
'jst:dev',
'less:dev',
'copy:dev',
'coffee:dev'
]);
};
])
}

8
tasks/register/default.js
View File

@ -13,15 +13,11 @@
*
*/
module.exports = function (grunt) {
grunt.registerTask('default', [
// 'polyfill:dev', //« uncomment to ALSO transpile during development (for broader browser compat.)
'compileAssets',
// 'babel', //« uncomment to ALSO transpile during development (for broader browser compat.)
'linkAssets',
'watch'
]);
};
])
}

6
tasks/register/linkAssets.js
View File

@ -7,10 +7,10 @@
* https://sailsjs.com/anatomy/tasks/register/link-assets.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.registerTask('linkAssets', [
'sails-linker:devJs',
'sails-linker:devStyles',
'sails-linker:clientSideTemplates'
]);
};
])
}

6
tasks/register/linkAssetsBuild.js
View File

@ -7,10 +7,10 @@
* https://sailsjs.com/anatomy/tasks/register/link-assets-build.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.registerTask('linkAssetsBuild', [
'sails-linker:devJsBuild',
'sails-linker:devStylesBuild',
'sails-linker:clientSideTemplatesBuild'
]);
};
])
}

6
tasks/register/linkAssetsBuildProd.js
View File

@ -7,10 +7,10 @@
* https://sailsjs.com/anatomy/tasks/register/link-assets-build-prod.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.registerTask('linkAssetsBuildProd', [
'sails-linker:prodJsBuild',
'sails-linker:prodStylesBuild',
'sails-linker:clientSideTemplatesBuild'
]);
};
])
}

27
tasks/register/polyfill.js
View File

@ -7,22 +7,21 @@
* https://sailsjs.com/anatomy/tasks/register/polyfill.js
*
*/
module.exports = function(grunt) {
grunt.registerTask('polyfill:prod', 'Add the polyfill file to the top of the list of files to concatenate', ()=>{
grunt.config.set('concat.js.src', [require('sails-hook-grunt/accessible/babel-polyfill')].concat(grunt.config.get('concat.js.src')));
});
grunt.registerTask('polyfill:dev', 'Add the polyfill file to the top of the list of files to copy and link', ()=>{
module.exports = function (grunt) {
grunt.registerTask('polyfill:prod', 'Add the polyfill file to the top of the list of files to concatenate', () => {
grunt.config.set('concat.js.src', [require('sails-hook-grunt/accessible/babel-polyfill')].concat(grunt.config.get('concat.js.src')))
})
grunt.registerTask('polyfill:dev', 'Add the polyfill file to the top of the list of files to copy and link', () => {
grunt.config.set('copy.dev.files', grunt.config.get('copy.dev.files').concat({
expand: true,
cwd: require('path').dirname(require('sails-hook-grunt/accessible/babel-polyfill')),
src: require('path').basename(require('sails-hook-grunt/accessible/babel-polyfill')),
dest: '.tmp/public/polyfill'
}));
var devLinkFiles = grunt.config.get('sails-linker.devJs.files');
grunt.config.set('sails-linker.devJs.files', Object.keys(devLinkFiles).reduce((linkerConfigSoFar, glob)=>{
linkerConfigSoFar[glob] = ['.tmp/public/polyfill/polyfill.min.js'].concat(devLinkFiles[glob]);
return linkerConfigSoFar;
}, {}));
});
};
}))
var devLinkFiles = grunt.config.get('sails-linker.devJs.files')
grunt.config.set('sails-linker.devJs.files', Object.keys(devLinkFiles).reduce((linkerConfigSoFar, glob) => {
linkerConfigSoFar[glob] = ['.tmp/public/polyfill/polyfill.min.js'].concat(devLinkFiles[glob])
return linkerConfigSoFar
}, {}))
})
}

13
tasks/register/prod.js
View File

@ -11,17 +11,16 @@
* https://sailsjs.com/anatomy/tasks/register/prod.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.registerTask('prod', [
'polyfill:prod', //« Remove this to skip transpilation in production (not recommended)
'polyfill:prod', // « Remove this to skip transpilation in production (not recommended)
'compileAssets',
'babel', //« Remove this to skip transpilation in production (not recommended)
'babel', // « Remove this to skip transpilation in production (not recommended)
'concat',
'uglify',
'cssmin',
'sails-linker:prodJs',
'sails-linker:prodStyles',
'sails-linker:clientSideTemplates',
]);
};
'sails-linker:clientSideTemplates'
])
}

6
tasks/register/syncAssets.js
View File

@ -7,11 +7,11 @@
* https://sailsjs.com/anatomy/tasks/register/sync-assets.js
*
*/
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.registerTask('syncAssets', [
'jst:dev',
'less:dev',
'sync:dev',
'coffee:dev'
]);
};
])
}