@kumologica/sdk 3.1.0-alpha2 → 3.1.0-beta2

package/src/app/ui/editor-api/lib/auth/index.js

@@ -4,13 +4,12 @@
  * @mixin @kumologica-core/editor-api_auth
  */
 
-var passport = require('passport');
-var oauth2orize = require('oauth2orize');
-
-var strategies = require('./strategies');
+// var passport = require('passport');
+// var oauth2orize = require('oauth2orize');
+// var strategies = require('./strategies');
 var Tokens = require('./tokens');
 var Users = require('./users');
-var permissions = require('./permissions');
+// var permissions = require('./permissions');
 
 var theme = require('../editor/theme');
 
@@ -19,15 +18,15 @@ const { util: runtimeUtil } = require('../../../../lib/runtime-loader');
 
 const log = runtimeUtil.log;
 
-passport.use(strategies.bearerStrategy.BearerStrategy);
-passport.use(strategies.clientPasswordStrategy.ClientPasswordStrategy);
-passport.use(strategies.anonymousStrategy);
+// passport.use(strategies.bearerStrategy.BearerStrategy);
+// passport.use(strategies.clientPasswordStrategy.ClientPasswordStrategy);
+// passport.use(strategies.anonymousStrategy);
 
-var server = oauth2orize.createServer();
+// var server = oauth2orize.createServer();
 
-server.exchange(
-  oauth2orize.exchange.password(strategies.passwordTokenExchange)
-);
+// server.exchange(
+//   oauth2orize.exchange.password(strategies.passwordTokenExchange)
+// );
 
 function init(_settings, storage) {
   settings = _settings;
@@ -51,24 +50,25 @@ function init(_settings, storage) {
  */
 function needsPermission(permission) {
   return function(req, res, next) {
-    if (settings && settings.adminAuth) {
-      return passport.authenticate(['bearer', 'anon'], { session: false })(
-        req,
-        res,
-        function() {
-          if (!req.user) {
-            return next();
-          }
-          if (permissions.hasPermission(req.authInfo.scope, permission)) {
-            return next();
-          }
-          log.audit({ event: 'permission.fail', permissions: permission }, req);
-          return res.status(401).end();
-        }
-      );
-    } else {
-      next();
-    }
+    // if (settings && settings.adminAuth) {
+    //   return passport.authenticate(['bearer', 'anon'], { session: false })(
+    //     req,
+    //     res,
+    //     function() {
+    //       if (!req.user) {
+    //         return next();
+    //       }
+    //       if (permissions.hasPermission(req.authInfo.scope, permission)) {
+    //         return next();
+    //       }
+    //       log.audit({ event: 'permission.fail', permissions: permission }, req);
+    //       return res.status(401).end();
+    //     }
+    //   );
+    // } else {
+    //   next();
+    // }
+    next();
   };
 }
 
@@ -79,11 +79,12 @@ function ensureClientSecret(req, res, next) {
   next();
 }
 function authenticateClient(req, res, next) {
-  return passport.authenticate(['oauth2-client-password'], { session: false })(
-    req,
-    res,
-    next
-  );
+  next();
+  // return passport.authenticate(['oauth2-client-password'], { session: false })(
+  //   req,
+  //   res,
+  //   next
+  // );
 }
 function getToken(req, res, next) {
   return server.token()(req, res, next);
@@ -194,53 +195,54 @@ function genericStrategy(adminApp, strategy) {
     })
   );
   //TODO: all passport references ought to be in ./auth
-  adminApp.use(passport.initialize());
-  adminApp.use(passport.session());
+  // adminApp.use(passport.initialize());
+  // adminApp.use(passport.session());
 
   var options = strategy.options;
 
-  passport.use(
-    new strategy.strategy(options, function() {
-      var originalDone = arguments[arguments.length - 1];
-      if (options.verify) {
-        var args = Array.from(arguments);
-        args[args.length - 1] = function(err, profile) {
-          if (err) {
-            return originalDone(err);
-          } else {
-            return completeVerify(profile, originalDone);
-          }
-        };
-        options.verify.apply(null, args);
-      } else {
-        var profile = arguments[arguments.length - 2];
-        return completeVerify(profile, originalDone);
-      }
-    })
-  );
+  // passport.use(
+  //   new strategy.strategy(options, function() {
+  //     var originalDone = arguments[arguments.length - 1];
+  //     if (options.verify) {
+  //       var args = Array.from(arguments);
+  //       args[args.length - 1] = function(err, profile) {
+  //         if (err) {
+  //           return originalDone(err);
+  //         } else {
+  //           return completeVerify(profile, originalDone);
+  //         }
+  //       };
+  //       options.verify.apply(null, args);
+  //     } else {
+  //       var profile = arguments[arguments.length - 2];
+  //       return completeVerify(profile, originalDone);
+  //     }
+  //   })
+  // );
 
-  adminApp.get(
-    '/auth/strategy',
-    passport.authenticate(strategy.name, {
-      session: false,
-      failureRedirect: settings.httpAdminRoot
-    }),
-    completeGenerateStrategyAuth
-  );
+  // adminApp.get(
+  //   '/auth/strategy',
+  //   passport.authenticate(strategy.name, {
+  //     session: false,
+  //     failureRedirect: settings.httpAdminRoot
+  //   }),
+  //   completeGenerateStrategyAuth
+  // );
 
   var callbackMethodFunc = adminApp.get;
   if (/^post$/i.test(options.callbackMethod)) {
     callbackMethodFunc = adminApp.post;
   }
-  callbackMethodFunc.call(
-    adminApp,
-    '/auth/strategy/callback',
-    passport.authenticate(strategy.name, {
-      session: false,
-      failureRedirect: settings.httpAdminRoot
-    }),
-    completeGenerateStrategyAuth
-  );
+
+  // callbackMethodFunc.call(
+  //   adminApp,
+  //   '/auth/strategy/callback',
+  //   passport.authenticate(strategy.name, {
+  //     session: false,
+  //     failureRedirect: settings.httpAdminRoot
+  //   }),
+  //   completeGenerateStrategyAuth
+  // );
 }
 function completeGenerateStrategyAuth(req, res) {
   var tokens = req.user.tokens;

package/src/app/ui/editor-api/lib/auth/strategies.js

@@ -1,144 +1,144 @@
  
 
-var BearerStrategy = require('passport-http-bearer').Strategy;
-var ClientPasswordStrategy = require('passport-oauth2-client-password')
-  .Strategy;
+// var BearerStrategy = require('passport-http-bearer').Strategy;
+// var ClientPasswordStrategy = require('passport-oauth2-client-password')
+//   .Strategy;
 
-var passport = require('passport');
-var crypto = require('crypto');
-var util = require('util');
+// var passport = require('passport');
+// var crypto = require('crypto');
+// var util = require('util');
 
-var Tokens = require('./tokens');
-var Users = require('./users');
-var Clients = require('./clients');
-var permissions = require('./permissions');
+// var Tokens = require('./tokens');
+// var Users = require('./users');
+// var Clients = require('./clients');
+// var permissions = require('./permissions');
 
-const { util: runtimeUtil } = require('../../../../lib/runtime-loader');
-const log = runtimeUtil.log;
+// const { util: runtimeUtil } = require('../../../../lib/runtime-loader');
+// const log = runtimeUtil.log;
 
-var bearerStrategy = function(accessToken, done) {
-  // is this a valid token?
-  Tokens.get(accessToken).then(function(token) {
-    if (token) {
-      Users.get(token.user).then(function(user) {
-        if (user) {
-          done(null, user, { scope: token.scope });
-        } else {
-          log.audit({ event: 'auth.invalid-token' });
-          done(null, false);
-        }
-      });
-    } else {
-      log.audit({ event: 'auth.invalid-token' });
-      done(null, false);
-    }
-  });
-};
-bearerStrategy.BearerStrategy = new BearerStrategy(bearerStrategy);
+// var bearerStrategy = function(accessToken, done) {
+//   // is this a valid token?
+//   Tokens.get(accessToken).then(function(token) {
+//     if (token) {
+//       Users.get(token.user).then(function(user) {
+//         if (user) {
+//           done(null, user, { scope: token.scope });
+//         } else {
+//           log.audit({ event: 'auth.invalid-token' });
+//           done(null, false);
+//         }
+//       });
+//     } else {
+//       log.audit({ event: 'auth.invalid-token' });
+//       done(null, false);
+//     }
+//   });
+// };
+// bearerStrategy.BearerStrategy = new BearerStrategy(bearerStrategy);
 
-var clientPasswordStrategy = function(clientId, clientSecret, done) {
-  Clients.get(clientId).then(function(client) {
-    if (client && client.secret == clientSecret) {
-      done(null, client);
-    } else {
-      log.audit({ event: 'auth.invalid-client', client: clientId });
-      done(null, false);
-    }
-  });
-};
-clientPasswordStrategy.ClientPasswordStrategy = new ClientPasswordStrategy(
-  clientPasswordStrategy
-);
+// var clientPasswordStrategy = function(clientId, clientSecret, done) {
+//   Clients.get(clientId).then(function(client) {
+//     if (client && client.secret == clientSecret) {
+//       done(null, client);
+//     } else {
+//       log.audit({ event: 'auth.invalid-client', client: clientId });
+//       done(null, false);
+//     }
+//   });
+// };
+// clientPasswordStrategy.ClientPasswordStrategy = new ClientPasswordStrategy(
+//   clientPasswordStrategy
+// );
 
-var loginAttempts = [];
-var loginSignInWindow = 600000; // 10 minutes
+// var loginAttempts = [];
+// var loginSignInWindow = 600000; // 10 minutes
 
-var passwordTokenExchange = function(client, username, password, scope, done) {
-  var now = Date.now();
-  loginAttempts = loginAttempts.filter(function(logEntry) {
-    return logEntry.time + loginSignInWindow > now;
-  });
-  loginAttempts.push({ time: now, user: username });
-  var attemptCount = 0;
-  loginAttempts.forEach(function(logEntry) {
-    /* istanbul ignore else */
-    if (logEntry.user == username) {
-      attemptCount++;
-    }
-  });
-  if (attemptCount > 5) {
-    log.audit({
-      event: 'auth.login.fail.too-many-attempts',
-      username: username,
-      client: client.id
-    });
-    done(
-      new Error('Too many login attempts. Wait 10 minutes and try again'),
-      false
-    );
-    return;
-  }
+// var passwordTokenExchange = function(client, username, password, scope, done) {
+//   var now = Date.now();
+//   loginAttempts = loginAttempts.filter(function(logEntry) {
+//     return logEntry.time + loginSignInWindow > now;
+//   });
+//   loginAttempts.push({ time: now, user: username });
+//   var attemptCount = 0;
+//   loginAttempts.forEach(function(logEntry) {
+//     /* istanbul ignore else */
+//     if (logEntry.user == username) {
+//       attemptCount++;
+//     }
+//   });
+//   if (attemptCount > 5) {
+//     log.audit({
+//       event: 'auth.login.fail.too-many-attempts',
+//       username: username,
+//       client: client.id
+//     });
+//     done(
+//       new Error('Too many login attempts. Wait 10 minutes and try again'),
+//       false
+//     );
+//     return;
+//   }
 
-  Users.authenticate(username, password).then(function(user) {
-    if (user) {
-      if (scope === '') {
-        scope = user.permissions;
-      }
-      if (permissions.hasPermission(user.permissions, scope)) {
-        loginAttempts = loginAttempts.filter(function(logEntry) {
-          return logEntry.user !== username;
-        });
-        Tokens.create(username, client.id, scope).then(function(tokens) {
-          log.audit({
-            event: 'auth.login',
-            username: username,
-            client: client.id,
-            scope: scope
-          });
-          done(null, tokens.accessToken, null, {
-            expires_in: tokens.expires_in
-          });
-        });
-      } else {
-        log.audit({
-          event: 'auth.login.fail.permissions',
-          username: username,
-          client: client.id,
-          scope: scope
-        });
-        done(null, false);
-      }
-    } else {
-      log.audit({
-        event: 'auth.login.fail.credentials',
-        username: username,
-        client: client.id,
-        scope: scope
-      });
-      done(null, false);
-    }
-  });
-};
+//   Users.authenticate(username, password).then(function(user) {
+//     if (user) {
+//       if (scope === '') {
+//         scope = user.permissions;
+//       }
+//       if (permissions.hasPermission(user.permissions, scope)) {
+//         loginAttempts = loginAttempts.filter(function(logEntry) {
+//           return logEntry.user !== username;
+//         });
+//         Tokens.create(username, client.id, scope).then(function(tokens) {
+//           log.audit({
+//             event: 'auth.login',
+//             username: username,
+//             client: client.id,
+//             scope: scope
+//           });
+//           done(null, tokens.accessToken, null, {
+//             expires_in: tokens.expires_in
+//           });
+//         });
+//       } else {
+//         log.audit({
+//           event: 'auth.login.fail.permissions',
+//           username: username,
+//           client: client.id,
+//           scope: scope
+//         });
+//         done(null, false);
+//       }
+//     } else {
+//       log.audit({
+//         event: 'auth.login.fail.credentials',
+//         username: username,
+//         client: client.id,
+//         scope: scope
+//       });
+//       done(null, false);
+//     }
+//   });
+// };
 
-function AnonymousStrategy() {
-  passport.Strategy.call(this);
-  this.name = 'anon';
-}
-util.inherits(AnonymousStrategy, passport.Strategy);
-AnonymousStrategy.prototype.authenticate = function(req) {
-  var self = this;
-  Users.default().then(function(anon) {
-    if (anon) {
-      self.success(anon, { scope: anon.permissions });
-    } else {
-      self.fail(401);
-    }
-  });
-};
+// function AnonymousStrategy() {
+//   passport.Strategy.call(this);
+//   this.name = 'anon';
+// }
+// util.inherits(AnonymousStrategy, passport.Strategy);
+// AnonymousStrategy.prototype.authenticate = function(req) {
+//   var self = this;
+//   Users.default().then(function(anon) {
+//     if (anon) {
+//       self.success(anon, { scope: anon.permissions });
+//     } else {
+//       self.fail(401);
+//     }
+//   });
+// };
 
-module.exports = {
-  bearerStrategy: bearerStrategy,
-  clientPasswordStrategy: clientPasswordStrategy,
-  passwordTokenExchange: passwordTokenExchange,
-  anonymousStrategy: new AnonymousStrategy()
-};
+// module.exports = {
+//   bearerStrategy: bearerStrategy,
+//   clientPasswordStrategy: clientPasswordStrategy,
+//   passwordTokenExchange: passwordTokenExchange,
+//   anonymousStrategy: new AnonymousStrategy()
+// };

package/src/app/ui/editor-api/lib/index.js

@@ -12,7 +12,7 @@
 var express = require('express');
 var bodyParser = require('body-parser');
 var util = require('util');
-var passport = require('passport');
+// var passport = require('passport');
 var when = require('when');
 var cors = require('cors');
 
@@ -58,7 +58,7 @@ function init(userSettings, _server, storage, runtimeAPI) {
       if (settings.adminAuth.type === 'strategy') {
         auth.genericStrategy(adminApp, settings.adminAuth.strategy);
       } else if (settings.adminAuth.type === 'credentials') {
-        adminApp.use(passport.initialize());
+        // adminApp.use(passport.initialize());
         adminApp.post(
           '/auth/token',
           auth.ensureClientSecret,

package/src/app/ui/editor-client/public/red/main-modals.min.js

@@ -1,16 +1 @@
-/**
- * Copyright JS Foundation and other contributors, http://js.foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-$(function(){"localhost"!==window.location.hostname&&"127.0.0.1"!==window.location.hostname&&(document.title=document.title+" : "+window.location.hostname),RED.init({apiRootUrl:"..",disableComms:!0})});
+$((function(){"localhost"!==window.location.hostname&&"127.0.0.1"!==window.location.hostname&&(document.title=document.title+" : "+window.location.hostname),RED.init({apiRootUrl:"..",disableComms:!0})}));

package/src/app/ui/editor-client/public/red/main.min.js

@@ -1,16 +1 @@
-/**
- * Copyright JS Foundation and other contributors, http://js.foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-$(function(){"localhost"!==window.location.hostname&&"127.0.0.1"!==window.location.hostname&&(document.title=document.title+" : "+window.location.hostname),RED.init({apiRootUrl:""})});
+$((function(){"localhost"!==window.location.hostname&&"127.0.0.1"!==window.location.hostname&&(document.title=document.title+" : "+window.location.hostname),RED.init({apiRootUrl:""})}));