From d8a2903e654cce91251f06faa812b77155b23660 Mon Sep 17 00:00:00 2001 From: jessop Date: Wed, 5 Dec 2018 14:54:14 -0500 Subject: [PATCH 01/18] adds CORS headers to serveFile --- server/controllers/assets/utils/serveFile.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/controllers/assets/utils/serveFile.js b/server/controllers/assets/utils/serveFile.js index 7344fdb2..8500dbe6 100644 --- a/server/controllers/assets/utils/serveFile.js +++ b/server/controllers/assets/utils/serveFile.js @@ -6,8 +6,10 @@ const serveFile = ({ filePath, fileType }, res) => { } const sendFileOptions = { headers: { - 'X-Content-Type-Options': 'nosniff', - 'Content-Type' : fileType, + 'X-Content-Type-Options' : 'nosniff', + 'Content-Type' : fileType, + 'Access-Control-Allow-Origin' : '*', + 'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept', }, }; logger.debug(`fileOptions for ${filePath}:`, sendFileOptions); -- 2.45.3 From 20dc54ba054082c0dbd2caf0fefad99fa6cc693f Mon Sep 17 00:00:00 2001 From: jessop Date: Thu, 6 Dec 2018 21:28:28 -0500 Subject: [PATCH 02/18] bugfixes around display of permanentURIs --- client/src/containers/AssetInfo/view.jsx | 6 ++++-- client/src/containers/PublishTool/index.js | 4 ++-- client/src/utils/buildURI.js | 10 --------- client/src/utils/createPermanentURI.js | 24 ++++++++++++++++++++++ utils/createModuleAliases.js | 6 ++++++ 5 files changed, 36 insertions(+), 14 deletions(-) delete mode 100644 client/src/utils/buildURI.js create mode 100644 client/src/utils/createPermanentURI.js diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx index 6876d8a1..8b76b907 100644 --- a/client/src/containers/AssetInfo/view.jsx +++ b/client/src/containers/AssetInfo/view.jsx @@ -9,6 +9,8 @@ import HorizontalSplit from '@components/HorizontalSplit'; import siteConfig from '@config/siteConfig.json'; import createCanonicalLink from '../../../../utils/createCanonicalLink'; import AssetInfoFooter from '../../components/AssetInfoFooter/index'; +import { createPermanentURI } from '@clientutils/createPermanentURI'; + const { details: { host } } = siteConfig; class AssetInfo extends React.Component { @@ -121,7 +123,7 @@ class AssetInfo extends React.Component { content={ } /> @@ -142,7 +144,7 @@ class AssetInfo extends React.Component { LBRY URL diff --git a/client/src/containers/PublishTool/index.js b/client/src/containers/PublishTool/index.js index 0e0d4b4f..335553d9 100644 --- a/client/src/containers/PublishTool/index.js +++ b/client/src/containers/PublishTool/index.js @@ -1,14 +1,14 @@ import {connect} from 'react-redux'; import View from './view'; import {selectAsset} from '../../selectors/show'; -import {buildURI} from '../../utils/buildURI'; +import {createPermanentURI} from '@clientutils/createPermanentURI'; const mapStateToProps = props => { const { show, publish } = props; const asset = selectAsset(show); let uri; if (asset) { - uri = `lbry://${buildURI(asset)}`; + uri = `lbry://${createPermanentURI(asset)}`; } return { disabled : publish.disabled, diff --git a/client/src/utils/buildURI.js b/client/src/utils/buildURI.js deleted file mode 100644 index b6fb599c..00000000 --- a/client/src/utils/buildURI.js +++ /dev/null @@ -1,10 +0,0 @@ -export const buildURI = asset => { - let channelName, certificateId, name, claimId; - if (asset.claimData) { - ({ channelName, certificateId, name, claimId } = asset.claimData); - } - if (channelName) { - return `${channelName}:${certificateId}/${name}`; - } - return `${claimId}/${name}`; -}; diff --git a/client/src/utils/createPermanentURI.js b/client/src/utils/createPermanentURI.js new file mode 100644 index 00000000..10f570e4 --- /dev/null +++ b/client/src/utils/createPermanentURI.js @@ -0,0 +1,24 @@ +/* +{ channelName, certificateId, name, claimId } = { claimData } = asset + +permanentUrl for a channel +@channelName#certificateId + +permanentUrl for an asset in a channel +@channelName#certificateId/name + +permanentUrl for an asset published anonymously +name#claimId +*/ + +export const createPermanentURI = asset => { + let channelName, certificateId, name, claimId; + if (asset.claimData) { + ({ channelName, certificateId, name, claimId } = asset.claimData); + } + else return 'Error: unknown asset at createPermanentURI.js'; + if (channelName) { + return `${channelName}#${certificateId}/${name}`; + } + return `${name}#${claimId}`; +}; diff --git a/utils/createModuleAliases.js b/utils/createModuleAliases.js index b9129f47..00506bb9 100644 --- a/utils/createModuleAliases.js +++ b/utils/createModuleAliases.js @@ -34,6 +34,11 @@ module.exports = () => { moduleAliases['@config'] = resolve('site/config'); moduleAliases['@private'] = resolve('site/private'); + // aliases for utils + moduleAliases['@globalutils'] = resolve('utils'); + moduleAliases['@clientutils'] = resolve(`${DEFAULT_ROOT}/utils`); + // moduleAliases['@serverutils'] = resolve('server/utils'); + // create specific aliases for locally defined components in the following folders moduleAliases = addAliasesForCustomComponentFolder('containers', moduleAliases); moduleAliases = addAliasesForCustomComponentFolder('components', moduleAliases); @@ -48,6 +53,7 @@ module.exports = () => { moduleAliases['@sagas'] = resolve(`${DEFAULT_ROOT}/sagas`); moduleAliases['@app'] = resolve(`${DEFAULT_ROOT}/app.js`); + // return finished aliases return moduleAliases; }; -- 2.45.3 From 596a4b70a358bac5ca856118989d59f60577e8e0 Mon Sep 17 00:00:00 2001 From: jessop Date: Sat, 8 Dec 2018 23:11:10 -0500 Subject: [PATCH 03/18] clarity changes to docs --- README.md | 8 ++++---- docs/ubuntuinstall.md | 30 +++++++++++++----------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 2e505ab2..64d44cb6 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ For a closed, custom-hosted and branded example, check out https://lbry.theantim #### Get some information ready: * mysqlusername * mysqlpassword - * domainname or 'http://localhost' + * domainname or 'http://localhost:3000' * speechport = 3000 #### Install and Set Up Dependencies @@ -31,10 +31,10 @@ For a closed, custom-hosted and branded example, check out https://lbry.theantim * 3333 * 4444 * [NodeJS](https://nodejs.org) - * [MySQL](https://dev.mysql.com/doc/refman/8.0/en/installing.html) + * [MySQL version 5.7 or higher](https://dev.mysql.com/doc/refman/8.0/en/installing.html) * mysqlusername or root * mysqlpassword - * You may need + * Requires mysql_native_password plugin ``` mysql> `ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'yourpassword';` ``` @@ -89,7 +89,7 @@ $ npm run start ``` #### View in browser - * Visit [http://localhost:3000](http://localhost:3000) in your browser + * Visit [http://localhost:3000](http://localhost:3000) in your browser #### Customize your app diff --git a/docs/ubuntuinstall.md b/docs/ubuntuinstall.md index 9f1f98aa..454cb327 100644 --- a/docs/ubuntuinstall.md +++ b/docs/ubuntuinstall.md @@ -6,23 +6,23 @@ * Ability to use SSH (putty + public key for windows users) * Ubuntu 16.04 or 18.04 VPS with root access * Your login info ready + * Exposed ports: 22, 80, 443, 3333, 4444 * Domain name with @ and www pointed at your VPS IP - * alternatively, specify http://localhost + * _alternatively, specify http://localhost:3000 as domain during speech configuration_ * Ability to send 5+ LBRY credits to an address * Noncommercial use - * _(configuration examples for nginx and certbot are included as an alternative)_ + * _alternative configuration examples for nginx and certbot are [here](https://github.com/lbryio/spee.ch/tree/master/docs/setup/conf/nginx)_ ## You'll be installing: - * MySQL DB + * MySQL DB version 5.7 or higher * Default Port 3306 + * mysql_native_password plugin * NodeJS v8+ - * Https proxy server - * Caddy for personal use - * Exposed ports: 22, 80, 443, 3333, 4444 - * Reverse proxies 80 redirected to 443 to App on 3000 - * Spee.ch started on port 3000 + * Caddy - https reverse proxy server + * automatically obtains tls certificate + * Redirects 80 (http) to 443 (https) to Speech on 3000 * Lbrynet DAEMON started on ports 3333 and 4444 - + * Spee.ch started on port 3000 # 1. Setup OS and install dependencies ## OS @@ -184,15 +184,13 @@ tmux allows you to run multiple things in different sessions. Useful for manuall ## Detatch tmux session `Control + b`, then `d` -<<<<<<< Updated upstream * `tmux` if you want to get back into tmux * `Control+b`, then `)` while in tmux session to cycle back to your lbrynet session to see output -======= + `tmux` _note: `Control+b`, then `)` while in tmux session to cycle back to your lbrynet session to see output_ ->>>>>>> Stashed changes ## Display wallet address to which to send 5+ LBC. @@ -227,19 +225,17 @@ tmux allows you to run multiple things in different sessions. Useful for manuall `npm run configure` -<<<<<<< Updated upstream -======= (once your wallet balance has cleared) `npm run configure` ->>>>>>> Stashed changes + * Database: lbry * Username: root * Password: your_mysql_password * Port: 3000 * Site Title: Your Site Name - * Enter your site's domain name: https://example.com or http://localhost + * Enter your site's domain name: https://example.com or http://localhost:3000 * Enter a directory where uploads should be stored: (/home/lbry/Uploads) `npm run start` @@ -255,7 +251,7 @@ tmux allows you to run multiple things in different sessions. Useful for manuall npm install -g pm2 ``` -### 7 Maintenance Proceedures +### 7 Maintenance Procedures #### Change daemon * backup wallet (private keys!) to a safe place -- 2.45.3 From 7391df8e840bd4e6959be11c89523c51c028d272 Mon Sep 17 00:00:00 2001 From: Niko Storni Date: Sat, 10 Nov 2018 19:11:12 -0500 Subject: [PATCH 04/18] run eslint pre-hook --- server/middleware/autoblockPublishMiddleware.js | 4 ++++ server/middleware/logMetricsMiddleware.js | 4 ++++ server/render/src/handleShowRender.jsx | 11 +++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/server/middleware/autoblockPublishMiddleware.js b/server/middleware/autoblockPublishMiddleware.js index 4c4456fb..08cc6e3f 100644 --- a/server/middleware/autoblockPublishMiddleware.js +++ b/server/middleware/autoblockPublishMiddleware.js @@ -58,7 +58,11 @@ const autoblockPublishBodyMiddleware = (req, res, next) => { let ip = (req.headers['x-forwarded-for'] || req.connection.remoteAddress).split(/,\s?/)[0]; const { channelName } = req.body; +<<<<<<< HEAD if (channelName && publishingChannelWhitelist.indexOf(channelName.toLowerCase()) !== -1) { +======= + if (channelName && publishingChannelWhitelist.indexOf(channelName) !== -1) { +>>>>>>> run eslint pre-hook delete ipCounts[ip]; } } diff --git a/server/middleware/logMetricsMiddleware.js b/server/middleware/logMetricsMiddleware.js index e4ddaceb..05c8ceb0 100644 --- a/server/middleware/logMetricsMiddleware.js +++ b/server/middleware/logMetricsMiddleware.js @@ -27,7 +27,11 @@ function logMetricsMiddleware (req, res, next) { db.Metrics.create({ time : Date.now(), +<<<<<<< HEAD isInternal: /node-fetch/.test(userAgent), +======= + isInternal: /node\-fetch/.test(userAgent), +>>>>>>> run eslint pre-hook isChannel : res.isChannel, claimId : res.claimId, routePath : httpContext.get('routePath'), diff --git a/server/render/src/handleShowRender.jsx b/server/render/src/handleShowRender.jsx index 6e527b0c..ca7d28b8 100644 --- a/server/render/src/handleShowRender.jsx +++ b/server/render/src/handleShowRender.jsx @@ -53,20 +53,23 @@ module.exports = (req, res) => { const runSaga = (action !== false && saga !== false); const renderPage = (store) => { - // Workaround, remove when a solution for async httpContext exists const showState = store.getState().show; const assetKeys = Object.keys(showState.assetList); +<<<<<<< HEAD if(assetKeys.length !== 0) { +======= + if (assetKeys.length !== 0) { +>>>>>>> run eslint pre-hook res.claimId = showState.assetList[assetKeys[0]].claimId; } else { const channelKeys = Object.keys(showState.channelList); - if(channelKeys.length !== 0) { + if (channelKeys.length !== 0) { res.claimId = showState.channelList[channelKeys[0]].longId; res.isChannel = true; - } + } } // render component to a string @@ -119,7 +122,7 @@ module.exports = (req, res) => { console.log(`redirecting ${req.originalUrl} to ${canonicalUrl}`); res.redirect(canonicalUrl); } - return renderPage(store) + return renderPage(store); }); } else { const store = createStore(Reducers); -- 2.45.3 From 81cc5a83237c37a466df305cd2bb97450f3444dd Mon Sep 17 00:00:00 2001 From: Niko Storni Date: Sat, 10 Nov 2018 23:31:09 -0500 Subject: [PATCH 05/18] add travis --- .travis.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..83e7d55f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,37 @@ +sudo: true +dist: xenial +#addons: +# apt: +# sources: +# - mysql-5.7-trusty +# packages: +# - mysql-server +# - mysql-client +language: node_js +node_js: + - "lts/*" +cache: + directories: + - "node_modules" +#services: +# - mysql + +before_install: +# - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;" +# - sudo mysql_upgrade -u root -ppassword +# - sudo service mysql restart +# - mysql -u root -ppassword -e 'CREATE DATABASE IF NOT EXISTS lbry;' +# - mysql -u root -ppassword -e "CREATE USER 'lbry'@'localhost' IDENTIFIED BY 'lbry';" +# - mysql -u root -ppassword -e "GRANT ALL ON lbry.* TO 'lbry'@'localhost';" +# - sudo service mysql restart + - dpkg --compare-versions `npm -v` ge 6.4.0 || npm i -g npm@^6.4.0 + +install: + - npm i + +script: + - npm run fix + - npm run build + - git diff --exit-code + + -- 2.45.3 From 4684e28fdbb65dcbea8211d2fa3a228c8a038608 Mon Sep 17 00:00:00 2001 From: Shawn Date: Sun, 9 Dec 2018 23:18:39 -0600 Subject: [PATCH 06/18] Revert "run eslint pre-hook" This reverts commit 7391df8e840bd4e6959be11c89523c51c028d272. --- server/middleware/autoblockPublishMiddleware.js | 4 ---- server/middleware/logMetricsMiddleware.js | 4 ---- server/render/src/handleShowRender.jsx | 11 ++++------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/server/middleware/autoblockPublishMiddleware.js b/server/middleware/autoblockPublishMiddleware.js index 08cc6e3f..4c4456fb 100644 --- a/server/middleware/autoblockPublishMiddleware.js +++ b/server/middleware/autoblockPublishMiddleware.js @@ -58,11 +58,7 @@ const autoblockPublishBodyMiddleware = (req, res, next) => { let ip = (req.headers['x-forwarded-for'] || req.connection.remoteAddress).split(/,\s?/)[0]; const { channelName } = req.body; -<<<<<<< HEAD if (channelName && publishingChannelWhitelist.indexOf(channelName.toLowerCase()) !== -1) { -======= - if (channelName && publishingChannelWhitelist.indexOf(channelName) !== -1) { ->>>>>>> run eslint pre-hook delete ipCounts[ip]; } } diff --git a/server/middleware/logMetricsMiddleware.js b/server/middleware/logMetricsMiddleware.js index 05c8ceb0..e4ddaceb 100644 --- a/server/middleware/logMetricsMiddleware.js +++ b/server/middleware/logMetricsMiddleware.js @@ -27,11 +27,7 @@ function logMetricsMiddleware (req, res, next) { db.Metrics.create({ time : Date.now(), -<<<<<<< HEAD isInternal: /node-fetch/.test(userAgent), -======= - isInternal: /node\-fetch/.test(userAgent), ->>>>>>> run eslint pre-hook isChannel : res.isChannel, claimId : res.claimId, routePath : httpContext.get('routePath'), diff --git a/server/render/src/handleShowRender.jsx b/server/render/src/handleShowRender.jsx index ca7d28b8..6e527b0c 100644 --- a/server/render/src/handleShowRender.jsx +++ b/server/render/src/handleShowRender.jsx @@ -53,23 +53,20 @@ module.exports = (req, res) => { const runSaga = (action !== false && saga !== false); const renderPage = (store) => { + // Workaround, remove when a solution for async httpContext exists const showState = store.getState().show; const assetKeys = Object.keys(showState.assetList); -<<<<<<< HEAD if(assetKeys.length !== 0) { -======= - if (assetKeys.length !== 0) { ->>>>>>> run eslint pre-hook res.claimId = showState.assetList[assetKeys[0]].claimId; } else { const channelKeys = Object.keys(showState.channelList); - if (channelKeys.length !== 0) { + if(channelKeys.length !== 0) { res.claimId = showState.channelList[channelKeys[0]].longId; res.isChannel = true; - } + } } // render component to a string @@ -122,7 +119,7 @@ module.exports = (req, res) => { console.log(`redirecting ${req.originalUrl} to ${canonicalUrl}`); res.redirect(canonicalUrl); } - return renderPage(store); + return renderPage(store) }); } else { const store = createStore(Reducers); -- 2.45.3 From 105282b6a3f3a54b48709567cabd762c298e7a21 Mon Sep 17 00:00:00 2001 From: Shawn Date: Sun, 9 Dec 2018 23:29:23 -0600 Subject: [PATCH 07/18] Migrate to jobs --- .travis.yml | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 83e7d55f..d1d2ef88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,22 +16,24 @@ cache: #services: # - mysql -before_install: -# - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;" -# - sudo mysql_upgrade -u root -ppassword -# - sudo service mysql restart -# - mysql -u root -ppassword -e 'CREATE DATABASE IF NOT EXISTS lbry;' -# - mysql -u root -ppassword -e "CREATE USER 'lbry'@'localhost' IDENTIFIED BY 'lbry';" -# - mysql -u root -ppassword -e "GRANT ALL ON lbry.* TO 'lbry'@'localhost';" -# - sudo service mysql restart - - dpkg --compare-versions `npm -v` ge 6.4.0 || npm i -g npm@^6.4.0 +jobs: + include: + - stage: "Build" + name: "Build Spee.ch" -install: - - npm i - -script: - - npm run fix - - npm run build - - git diff --exit-code + before_install: + # - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;" + # - sudo mysql_upgrade -u root -ppassword + # - sudo service mysql restart + # - mysql -u root -ppassword -e 'CREATE DATABASE IF NOT EXISTS lbry;' + # - mysql -u root -ppassword -e "CREATE USER 'lbry'@'localhost' IDENTIFIED BY 'lbry';" + # - mysql -u root -ppassword -e "GRANT ALL ON lbry.* TO 'lbry'@'localhost';" + # - sudo service mysql restart + - dpkg --compare-versions `npm -v` ge 6.4.0 || npm i -g npm@^6.4.0 + install: + - npm i + script: + # - npm run fix + - npm run build -- 2.45.3 From 31a65f566e6b42b57f2544293bc835d4ecd74e67 Mon Sep 17 00:00:00 2001 From: Shawn Date: Sun, 9 Dec 2018 23:44:00 -0600 Subject: [PATCH 08/18] Add test environment setup --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index d1d2ef88..8318861b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,3 +37,12 @@ jobs: script: # - npm run fix - npm run build + + - stage: "Setup Tests" + name: "Setup Test Environment" + + script: + - cp ./cli/defaults/* ./site/config/ + - echo '{ "sessionKey": "session", "masterPassword": false }' > ./site/private/authConfig.json + - npm start & + - sleep 10 # Attempt to collect output for 10 seconds -- 2.45.3 From 341b9e3a5fc2871bc691ec89f9dad25dc170674d Mon Sep 17 00:00:00 2001 From: Shawn Date: Sun, 9 Dec 2018 23:47:15 -0600 Subject: [PATCH 09/18] Adjust configuration before build --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8318861b..c67fa48a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,13 @@ cache: jobs: include: + - stage: "Configure" + name: "Configure Spee.ch" + + script: + - cp ./cli/defaults/* ./site/config/ + - echo '{ "sessionKey": "session", "masterPassword": false }' > ./site/private/authConfig.json + - stage: "Build" name: "Build Spee.ch" @@ -38,11 +45,9 @@ jobs: # - npm run fix - npm run build - - stage: "Setup Tests" - name: "Setup Test Environment" + - stage: "Run" + name: "Run Test Environment" script: - - cp ./cli/defaults/* ./site/config/ - - echo '{ "sessionKey": "session", "masterPassword": false }' > ./site/private/authConfig.json - npm start & - sleep 10 # Attempt to collect output for 10 seconds -- 2.45.3 From 68f7eb11b5082482432428521ff80ef4a0b54a5e Mon Sep 17 00:00:00 2001 From: Shawn Date: Sun, 9 Dec 2018 23:54:17 -0600 Subject: [PATCH 10/18] Adjust configuration before build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c67fa48a..deb12441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ jobs: script: - cp ./cli/defaults/* ./site/config/ - - echo '{ "sessionKey": "session", "masterPassword": false }' > ./site/private/authConfig.json + - 'echo \'{ "sessionKey": "session", "masterPassword": false }\' > ./site/private/authConfig.json' - stage: "Build" name: "Build Spee.ch" -- 2.45.3 From 997e909117b0883f6043612801fdb270209fd372 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 10 Dec 2018 00:00:32 -0600 Subject: [PATCH 11/18] Fix YAML formatting --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index deb12441..6b46adcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,8 @@ jobs: script: - cp ./cli/defaults/* ./site/config/ - - 'echo \'{ "sessionKey": "session", "masterPassword": false }\' > ./site/private/authConfig.json' + - | + echo \'{ "sessionKey": "session", "masterPassword": false }\' > ./site/private/authConfig.json - stage: "Build" name: "Build Spee.ch" -- 2.45.3 From d3741c5da1274de75a0148aeb7fb353f3809acd6 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 10 Dec 2018 00:04:34 -0600 Subject: [PATCH 12/18] Adjust build order --- .travis.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b46adcc..7dfdee58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,16 +18,8 @@ cache: jobs: include: - - stage: "Configure" - name: "Configure Spee.ch" - - script: - - cp ./cli/defaults/* ./site/config/ - - | - echo \'{ "sessionKey": "session", "masterPassword": false }\' > ./site/private/authConfig.json - - - stage: "Build" - name: "Build Spee.ch" + - stage: "Setup" + name: "Setup Build Environment" before_install: # - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;" @@ -42,6 +34,17 @@ jobs: install: - npm i + - stage: "Configure" + name: "Configure Spee.ch" + + script: + - cp ./cli/defaults/* ./site/config/ + - | + echo \'{ "sessionKey": "session", "masterPassword": false }\' > ./site/private/authConfig.json + + - stage: "Build" + name: "Build Spee.ch" + script: # - npm run fix - npm run build -- 2.45.3 From 39bd8d43fe453fc272f28a7e3e6029a2497c1af6 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 10 Dec 2018 00:09:11 -0600 Subject: [PATCH 13/18] Define script for setup to disable automatic tests during setup --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7dfdee58..454445e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ jobs: # - sudo service mysql restart - dpkg --compare-versions `npm -v` ge 6.4.0 || npm i -g npm@^6.4.0 - install: + script: - npm i - stage: "Configure" -- 2.45.3 From 8651476242e1995d3eba113538b7c901472238de Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 10 Dec 2018 00:12:14 -0600 Subject: [PATCH 14/18] Attempt to fix travis cache error --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 454445e8..3c83b83c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,11 @@ jobs: # - sudo service mysql restart - dpkg --compare-versions `npm -v` ge 6.4.0 || npm i -g npm@^6.4.0 - script: + install: - npm i + script: 'true' # Disables automatic stage tests + - stage: "Configure" name: "Configure Spee.ch" -- 2.45.3 From 22cfb334093b1498889e5de9aab86a3c831abf93 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 10 Dec 2018 00:17:47 -0600 Subject: [PATCH 15/18] Consolidate jobs because Travis does not handle them well --- .travis.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c83b83c..8d31653b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,8 @@ cache: jobs: include: - - stage: "Setup" - name: "Setup Build Environment" + - stage: "Build" + name: "Build and run test environment" before_install: # - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;" @@ -34,26 +34,11 @@ jobs: install: - npm i - script: 'true' # Disables automatic stage tests - - - stage: "Configure" - name: "Configure Spee.ch" - script: - cp ./cli/defaults/* ./site/config/ - | echo \'{ "sessionKey": "session", "masterPassword": false }\' > ./site/private/authConfig.json - - - stage: "Build" - name: "Build Spee.ch" - - script: # - npm run fix - npm run build - - - stage: "Run" - name: "Run Test Environment" - - script: - npm start & - sleep 10 # Attempt to collect output for 10 seconds -- 2.45.3 From 2b3cd54f30abf430f1074fc33017ec83936d7f80 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 10 Dec 2018 00:20:39 -0600 Subject: [PATCH 16/18] Fix test authConfig.json --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8d31653b..95af295c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ jobs: script: - cp ./cli/defaults/* ./site/config/ - | - echo \'{ "sessionKey": "session", "masterPassword": false }\' > ./site/private/authConfig.json + echo '{ "sessionKey": "session", "masterPassword": false }' > ./site/private/authConfig.json # - npm run fix - npm run build - npm start & -- 2.45.3 From d38d8f106138b7fbd4df9e026c944c397adc5a39 Mon Sep 17 00:00:00 2001 From: jessop Date: Thu, 13 Dec 2018 22:43:03 -0500 Subject: [PATCH 17/18] Sets proper 404 status in most cases --- server/render/src/handleShowRender.jsx | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/server/render/src/handleShowRender.jsx b/server/render/src/handleShowRender.jsx index 6e527b0c..b306ae5f 100644 --- a/server/render/src/handleShowRender.jsx +++ b/server/render/src/handleShowRender.jsx @@ -20,11 +20,11 @@ const createCanonicalLink = require('../../../utils/createCanonicalLink'); const getCanonicalUrlFromShow = show => { const requestId = show.requestList[show.request.id]; const requestType = show.request.type; - + if (!requestId || !requestType) { return null; } - + switch (requestType) { case 'ASSET_DETAILS': const asset = show.assetList[requestId.key]; @@ -57,16 +57,15 @@ module.exports = (req, res) => { // Workaround, remove when a solution for async httpContext exists const showState = store.getState().show; const assetKeys = Object.keys(showState.assetList); - - if(assetKeys.length !== 0) { - res.claimId = showState.assetList[assetKeys[0]].claimId; - } else { - const channelKeys = Object.keys(showState.channelList); + const channelKeys = Object.keys(showState.channelList); - if(channelKeys.length !== 0) { - res.claimId = showState.channelList[channelKeys[0]].longId; - res.isChannel = true; - } + if (assetKeys.length !== 0) { + res.claimId = showState.assetList[assetKeys[0]].claimId; + } else if (channelKeys.length !== 0) { + res.claimId = showState.channelList[channelKeys[0]].longId; + res.isChannel = true; + } else { + res.status(404); } // render component to a string -- 2.45.3 From dbddf06ff51d278f037cd0c345574860c171fe71 Mon Sep 17 00:00:00 2001 From: jessopb <36554050+jessopb@users.noreply.github.com> Date: Fri, 14 Dec 2018 17:10:12 -0500 Subject: [PATCH 18/18] Revert "Sets proper 404 status in most cases" --- server/render/src/handleShowRender.jsx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/server/render/src/handleShowRender.jsx b/server/render/src/handleShowRender.jsx index b306ae5f..6e527b0c 100644 --- a/server/render/src/handleShowRender.jsx +++ b/server/render/src/handleShowRender.jsx @@ -20,11 +20,11 @@ const createCanonicalLink = require('../../../utils/createCanonicalLink'); const getCanonicalUrlFromShow = show => { const requestId = show.requestList[show.request.id]; const requestType = show.request.type; - + if (!requestId || !requestType) { return null; } - + switch (requestType) { case 'ASSET_DETAILS': const asset = show.assetList[requestId.key]; @@ -57,15 +57,16 @@ module.exports = (req, res) => { // Workaround, remove when a solution for async httpContext exists const showState = store.getState().show; const assetKeys = Object.keys(showState.assetList); - const channelKeys = Object.keys(showState.channelList); - - if (assetKeys.length !== 0) { + + if(assetKeys.length !== 0) { res.claimId = showState.assetList[assetKeys[0]].claimId; - } else if (channelKeys.length !== 0) { - res.claimId = showState.channelList[channelKeys[0]].longId; - res.isChannel = true; } else { - res.status(404); + const channelKeys = Object.keys(showState.channelList); + + if(channelKeys.length !== 0) { + res.claimId = showState.channelList[channelKeys[0]].longId; + res.isChannel = true; + } } // render component to a string -- 2.45.3