Revert "Improve latest download (ArekSredzki#288)" (ArekSredzki#292)

This reverts commit 2aacccf.

.gitignore

@@ -41,7 +41,7 @@
 
 config/local.js
 database.json
-releases
+
 
 
 

README.md

@@ -26,19 +26,13 @@ If you host your project on your Github **and** do not need a UI for your app, t
 - :sparkles: Simple but powerful download urls (**NOTE:** when no assets are uploaded, server returns `404` by default):
     - `/download/latest`
     - `/download/latest/:platform`
-    - `/download/latest/:platform/:filename`
     - `/download/:version`
     - `/download/:version/:platform`
     - `/download/:version/:platform/:filename`
     - `/download/channel/:channel`
     - `/download/channel/:channel/:platform`
-    - `/download/channel/:channel/:platform/:filename`
     - `/download/flavor/:flavor/latest`
     - `/download/flavor/:flavor/latest/:platform`
-    - `/download/flavor/:flavor/latest/:platform/:filename`
-    - `/download/flavor/:flavor/latest/channel/:channel/`
-    - `/download/flavor/:flavor/latest/channel/:channel/:platform`
-    - `/download/flavor/:flavor/latest/channel/:channel/:platform/:filename`
     - `/download/flavor/:flavor/:version`
     - `/download/flavor/:flavor/:version/:platform`
     - `/download/flavor/:flavor/:version/:platform/:filename`

api/controllers/AssetController.js

@@ -9,7 +9,6 @@ var _ = require('lodash');
 var path = require('path');
 var actionUtil = require('sails/lib/hooks/blueprints/actionUtil');
 var Promise = require('bluebird');
-const PlatformService = require('../services/PlatformService');
 
 module.exports = {
 
@@ -20,12 +19,12 @@ module.exports = {
    * This is because Squirrel.Windows does a poor job of parsing the filename,
    * and so we must fake the filenames of x32 and x64 versions to be the same.
    *
-   * (GET /download/latest/:platform?/:filename?': 'AssetController.download')
+   * (GET /download/latest/:platform?': 'AssetController.download')
    * (GET /download/:version/:platform?/:filename?': 'AssetController.download')
-   * (GET /download/channel/:channel/:platform?/:filename?': 'AssetController.download')
-   * (GET /download/flavor/:flavor/latest/:platform?/:filename?': 'AssetController.download')
+   * (GET /download/channel/:channel/:platform?': 'AssetController.download')
+   * (GET /download/flavor/:flavor/latest/:platform?': 'AssetController.download')
    * (GET /download/flavor/:flavor/:version/:platform?/:filename?': 'AssetController.download')
-   * (GET /download/flavor/:flavor/channel/:channel/:platform?/:filename?': 'AssetController.download')
+   * (GET /download/flavor/:flavor/channel/:channel/:platform?': 'AssetController.download')
    */
   download: function(req, res) {
     var channel = req.params.channel;
@@ -38,7 +37,7 @@ module.exports = {
     var platforms;
     var platform = req.param('platform');
     if (platform) {
-      platforms = PlatformService.detect(platform, true);
+      platforms = [platform];
     }
 
     // Normalize filetype by prepending with period

api/controllers/AuthController.js

@@ -19,15 +19,11 @@ var AuthController = {
           return res.serverError('Could not retrieve user');
         }
 
-        const token = AuthToken.issueToken({
-          sub: user.username
-        })
-
-        res.cookie("authToken", token, {httpOnly: true, maxAge: 900000, secure: true})
-
         return res.json({
           user: user.username,
-          token: token
+          token: AuthToken.issueToken({
+            sub: user.username
+          })
         });
       });
   }

api/policies/authToken.js

@@ -25,8 +25,6 @@ module.exports = function(req, res, next) {
     token = req.param('token');
     // We delete the token from param to not mess with blueprints
     delete req.query.token;
-  }  else if (req.cookies && req.cookies.authToken) {
-    token = req.cookies.authToken;
   } else {
     return res.forbidden('No authorization header found.');
   }

config/policies.js

@@ -26,11 +26,7 @@ module.exports.policies = {
    *                                                                          *
    ***************************************************************************/
 
-  '*': 'authToken',
-
-  AuthController: {
-    login: 'noCache'
-  },
+  '*': true,
 
   AssetController: {
     create: 'authToken',
@@ -59,8 +55,6 @@ module.exports.policies = {
     redirect: 'noCache',
     general: 'noCache',
     windows: 'noCache',
-    releaseNotes: 'noCache',
-    electronUpdaterWin: 'noCache',
-    electronUpdaterMac: 'noCache'
+    releaseNotes: 'noCache'
   }
 };

config/routes.js

@@ -31,12 +31,11 @@ module.exports.routes = {
 
   'PUT /version/availability/:version/:timestamp': 'VersionController.availability',
 
-  'GET /download/latest/:platform?/:filename?': 'AssetController.download',
-  'GET /download/channel/:channel/:platform?/:filename?': 'AssetController.download',
+  'GET /download/latest/:platform?': 'AssetController.download',
+  'GET /download/channel/:channel/:platform?': 'AssetController.download',
   'GET /download/:version/:platform?/:filename?': 'AssetController.download',
-  'GET /download/flavor/:flavor/latest/:platform?/:filename?': 'AssetController.download',
-  'GET /download/flavor/:flavor/channel/:channel/:platform?/:filename?': 'AssetController.download',
-  'GET /download/flavor/:flavor/latest/channel/:channel/:platform?/:filename?': 'AssetController.download',
+  'GET /download/flavor/:flavor/latest/:platform?': 'AssetController.download',
+  'GET /download/flavor/:flavor/channel/:channel/:platform?': 'AssetController.download',
   'GET /download/flavor/:flavor/:version/:platform?/:filename?': 'AssetController.download',
 
   'GET /update': 'VersionController.redirect',

docs/urls.md

@@ -8,10 +8,6 @@ Electron Release Server provides a variety of urls to access release assets.
 #### Latest version for specific platform:
 - `http://download.myapp.com/download/latest/osx`
 - `http://download.myapp.com/download/flavor/default/latest/osx`
-#### Latest version for specific platform and file extension
-- `http://download.myapp.com/download/latest/osx/update.zip`
-- `http://download.myapp.com/download/flavor/default/latest/osx/update.dmg`
-- `http://download.myapp.com/download/flavor/default/latest/channel/stable/osx/update.dmg`
 #### Specific version for detected platform:
 - `http://download.myapp.com/download/1.1.0`
 - `http://download.myapp.com/download/flavor/default/1.1.0`