server/controllers/serveController.js

@@ -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';

server/helpers/authHelpers.js

@@ -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);
-  },
-};

server/routes/api/channelAvailability.js

@@ -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');
 
 /*
 

server/routes/api/channelClaims.js

@@ -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';
 

server/routes/api/channelData.js

@@ -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';
 

server/routes/api/channelShortId.js

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

server/routes/api/claimAvailability.js

@@ -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');
 
 /*
 

server/routes/api/claimData.js

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

server/routes/api/claimGet.js

@@ -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');
 
 /*

server/routes/api/claimList.js

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

server/routes/api/claimLongId.js

@@ -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';

server/routes/api/claimPublish.js

@@ -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');
 
 /*

server/routes/api/claimResolve.js

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

server/routes/api/claimShortId.js

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

server/routes/api/fileAvailability.js

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

server/routes/assets/serveAssetByClaim.js

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

server/routes/assets/serveAssetByIdentifierAndClaim.js

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

server/routes/utils/serve.js

@@ -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';

server/speechPassport/index.js

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

server/speechPassport/utils/deserializeUser.js

@@ -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;

server/speechPassport/utils/local-login.js

@@ -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) => {

server/speechPassport/utils/local-signup.js

@@ -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(
   {

server/speechPassport/utils/serializeUser.js

@@ -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;