LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

412 blocked content #428

Merged
bones7242 merged 13 commits from 412-blocked_content into master 2018-05-01 01:07:59 +02:00
Conversation 2 Commits 13 Files changed 80 +46 -37
26 changed files with 46 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cfb7e47fbd - Show all commits

2
server/controllers/serveController.js
View file

@ -1,6 +1,6 @@
const db = require('../models');
const logger = require('winston');
const { returnPaginatedChannelClaims } = require('../helpers/channelPagination.js');
const { returnPaginatedChannelClaims } = require('./utils/channelPagination.js');
const NO_CHANNEL = 'NO_CHANNEL';
const NO_CLAIM = 'NO_CLAIM';

0
server/helpers/channelPagination.js → server/controllers/utils/channelPagination.js
View file

10
server/helpers/authHelpers.js
View file

@ -1,10 +0,0 @@
module.exports = {
serializeSpeechUser (user, done) { // returns user data to be serialized into session
console.log('serializing user');
done(null, user);
},
deserializeSpeechUser (user, done) { // deserializes session and populates additional info to req.user
console.log('deserializing user');
done(null, user);
},
};

2
server/routes/api/channelAvailability.js
View file

@ -1,6 +1,6 @@
const { checkChannelAvailability } = require('../../controllers/publishController.js');
const { sendGATimingEvent } = require('../../helpers/googleAnalytics.js');
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
/*

2
server/routes/api/channelClaims.js
View file

@ -1,5 +1,5 @@
const { getChannelClaims } = require('../../controllers/serveController.js');
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
const NO_CHANNEL = 'NO_CHANNEL';

2
server/routes/api/channelData.js
View file

@ -1,5 +1,5 @@
const { getChannelData } = require('../../controllers/serveController.js');
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
const NO_CHANNEL = 'NO_CHANNEL';

2
server/routes/api/channelShortId.js
View file

@ -1,4 +1,4 @@
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
const db = require('../../models');
/*

2
server/routes/api/claimAvailability.js
View file

@ -1,6 +1,6 @@
const { claimNameIsAvailable } = require('../../controllers/publishController.js');
const { sendGATimingEvent } = require('../../helpers/googleAnalytics.js');
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
/*

2
server/routes/api/claimData.js
View file

@ -1,4 +1,4 @@
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
const db = require('../../models');
/*

2
server/routes/api/claimGet.js
View file

@ -1,6 +1,6 @@
const { getClaim } = require('../../helpers/lbryApi.js');
const { addGetResultsToFileData, createFileData } = require('../../helpers/publishHelpers.js');
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
const db = require('../../models');
/*

2
server/routes/api/claimList.js
View file

@ -1,5 +1,5 @@
const { getClaimList } = require('../../helpers/lbryApi.js');
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
/*

2
server/routes/api/claimLongId.js
View file

@ -1,5 +1,5 @@
const { getClaimId } = require('../../controllers/serveController.js');
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
const NO_CHANNEL = 'NO_CHANNEL';
const NO_CLAIM = 'NO_CLAIM';

2
server/routes/api/claimPublish.js
View file

@ -2,7 +2,7 @@ const { createBasicPublishParams, createThumbnailPublishParams, parsePublishApiR
const { claimNameIsAvailable, publish } = require('../../controllers/publishController.js');
const { authenticateUser } = require('../../auth/authentication.js');
const { sendGATimingEvent } = require('../../helpers/googleAnalytics.js');
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
const { details: { host } } = require('../../../config/siteConfig.js');
/*

2
server/routes/api/claimResolve.js
View file

@ -1,5 +1,5 @@
const { resolveUri } = require('../../helpers/lbryApi.js');
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
/*

2
server/routes/api/claimShortId.js
View file

@ -1,4 +1,4 @@
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
const db = require('../../models');
/*

2
server/routes/api/fileAvailability.js
View file

@ -1,4 +1,4 @@
const { handleErrorResponse } = require('../../helpers/errorHandlers.js');
const { handleErrorResponse } = require('../utils/errorHandlers.js');
const db = require('../../models');
/*

8
server/routes/assets/serveAssetByClaim.js
View file

@ -1,6 +1,10 @@
const { sendGAServeEvent } = require('../../helpers/googleAnalytics');
const { determineResponseType, logRequestData, getClaimIdAndServeAsset } = require('../../helpers/serveHelpers.js');
const lbryUri = require('../../helpers/lbryUri.js');
const {
determineResponseType,
logRequestData,
getClaimIdAndServeAsset,
} = require('../utils/serve.js');
const lbryUri = require('../utils/lbryUri.js');
const handleShowRender = require('../../render/build/handleShowRender.js');
const SERVE = 'SERVE';

4
server/routes/assets/serveAssetByIdentifierAndClaim.js
View file

@ -4,8 +4,8 @@ const {
flipClaimNameAndIdForBackwardsCompatibility,
logRequestData,
getClaimIdAndServeAsset,
} = require('../../helpers/serveHelpers.js');
const lbryUri = require('../../helpers/lbryUri.js');
} = require('../utils/serve.js');
const lbryUri = require('../utils/lbryUri.js');
const handleShowRender = require('../../render/build/handleShowRender.js');
const SERVE = 'SERVE';

0
server/helpers/errorHandlers.js → server/routes/utils/errorHandlers.js
View file

0
server/helpers/lbryUri.js → server/routes/utils/lbryUri.js
View file

2
server/helpers/serveHelpers.js → server/routes/utils/serve.js
View file

@ -1,5 +1,5 @@
const logger = require('winston');
const { getClaimId, getLocalFileRecord } = require('../controllers/serveController.js');
const { getClaimId, getLocalFileRecord } = require('../../controllers/serveController.js');
const { handleErrorResponse } = require('./errorHandlers.js');
const SERVE = 'SERVE';

11
server/speechPassport/index.js
View file

@ -1,10 +1,11 @@
const passport = require('passport');
const localLoginStrategy = require('./local-login.js');
const localSignupStrategy = require('./local-signup.js');
const { serializeSpeechUser, deserializeSpeechUser } = require('../helpers/authHelpers.js');
const localLoginStrategy = require('./utils/local-login.js');
const localSignupStrategy = require('./utils/local-signup.js');
const serializeUser = require('./utils/serializeUser.js');
const deserializeUser = require('./utils/deserializeUser.js');
passport.deserializeUser(deserializeSpeechUser);
passport.serializeUser(serializeSpeechUser);
passport.deserializeUser(deserializeUser);
passport.serializeUser(serializeUser);
passport.use('local-login', localLoginStrategy);
passport.use('local-signup', localSignupStrategy);

7
server/speechPassport/utils/deserializeUser.js Normal file
View file

@ -0,0 +1,7 @@
const deserializeUser = (user, done) => {
// deserializes session and populates additional info to req.user
console.log('deserializing user');
done(null, user);
};
module.exports = deserializeUser;

2
server/speechPassport/local-login.js → server/speechPassport/utils/local-login.js
View file

@ -1,6 +1,6 @@
const PassportLocalStrategy = require('passport-local').Strategy;
const logger = require('winston');
const db = require('../models');
const db = require('../../models/index');
const returnUserAndChannelInfo = (userInstance) => {
return new Promise((resolve, reject) => {

4
server/speechPassport/local-signup.js → server/speechPassport/utils/local-signup.js
View file

@ -1,7 +1,7 @@
const PassportLocalStrategy = require('passport-local').Strategy;
const lbryApi = require('../helpers/lbryApi.js');
const lbryApi = require('../../helpers/lbryApi.js');
const logger = require('winston');
const db = require('../models');
const db = require('../../models/index');
module.exports = new PassportLocalStrategy(
{

7
server/speechPassport/utils/serializeUser.js Normal file
View file

@ -0,0 +1,7 @@
const serializeUser = (user, done) => {
// returns user data to be serialized into session
console.log('serializing user');
done(null, user);
};
module.exports = serializeUser;