new release

DocNow · Mar 3, 2021 · 4d2705b · 4d2705b
1 parent 3050cd1
commit 4d2705b
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 31 deletions.
diff --git a/dist/archive/index.html b/dist/archive/index.html
@@ -19,5 +19,5 @@
 </head>
 <body>
     <div id="app"></div>
-<script type="text/javascript" src="main-6613e4913d732009432c.js"></script></body>
+<script type="text/javascript" src="main-7f2e565d97814be5dcdd.js"></script></body>
 </html>
diff --git a/dist/archive/main-6613e4913d732009432c.js.map b/dist/archive/main-6613e4913d732009432c.js.map
diff --git a/dist/archive/main-6613e4913d732009432c.js → dist/archive/main-7f2e565d97814be5dcdd.js b/dist/archive/main-6613e4913d732009432c.js → dist/archive/main-7f2e565d97814be5dcdd.js
diff --git a/dist/archive/main-7f2e565d97814be5dcdd.js.map b/dist/archive/main-7f2e565d97814be5dcdd.js.map
diff --git a/dist/client/index.html b/dist/client/index.html
@@ -18,5 +18,5 @@
 </head>
 <body>
     <div id="app"></div>
-<script type="text/javascript" src="/main-e7b081c34806c044fbe6.js"></script></body>
+<script type="text/javascript" src="/main-2ed11e2461153c775e36.js"></script></body>
 </html>
diff --git a/dist/client/main-e7b081c34806c044fbe6.js → dist/client/main-2ed11e2461153c775e36.js b/dist/client/main-e7b081c34806c044fbe6.js → dist/client/main-2ed11e2461153c775e36.js
diff --git a/dist/client/main-e7b081c34806c044fbe6.js.map → dist/client/main-2ed11e2461153c775e36.js.map b/dist/client/main-e7b081c34806c044fbe6.js.map → dist/client/main-2ed11e2461153c775e36.js.map
diff --git a/dist/server/api.js b/dist/server/api.js
@@ -168,16 +168,16 @@ app.get('/settings', /*#__PURE__*/function () {
           case 2:
             settings = _context3.sent;
 
-            if (!settings || !req.user) {
-              if (!req.user || !req.user.isSuperUser) {
-                delete settings.appKey;
-                delete settings.appSecret;
-              }
-
-              res.json(settings);
+            // if they aren't logged in or the they're not an admin
+            // be sure to delete the app key settings!
+            if (!req.user || req.user && !req.user.isSuperUser) {
+              delete settings.appKey;
+              delete settings.appSecret;
             }
 
-          case 4:
+            res.json(settings);
+
+          case 5:
           case "end":
             return _context3.stop();
         }

diff --git a/dist/server/auth.js b/dist/server/auth.js
@@ -2,6 +2,10 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _express = _interopRequireDefault(require("express"));
 
 var _passport = _interopRequireDefault(require("passport"));
@@ -21,8 +25,9 @@ var activateKeys = function activateKeys() {
         consumerSecret: settings.appSecret,
         callbackURL: '/auth/twitter/callback',
         proxy: true,
-        includeEmail: true
-      }, function (token, tokenSecret, profile, cb) {
+        includeEmail: true,
+        passReqToCallback: true
+      }, function (req, token, tokenSecret, profile, cb) {
         db.getUserByTwitterUserId(profile.id).then(function (user) {
           if (!user) {
             var newUser = {
@@ -64,12 +69,46 @@ _passport["default"].deserializeUser(function (userId, done) {
 
 app.use(_passport["default"].initialize());
 app.use(_passport["default"].session());
-app.get('/twitter', _passport["default"].authenticate('twitter'));
-app.get('/twitter/callback', _passport["default"].authenticate('twitter', {
-  failureRedirect: '/login'
-}), function (req, res) {
-  res.redirect('/profile/');
+app.get('/twitter', function (req, res, next) {
+  _passport["default"].authenticate('twitter', function (err) {
+    if (err) {
+      return res.redirect("/settings/?error=".concat(encodeURIComponent(err.message)));
+    }
+  })(req, res, next);
 });
+app.get('/twitter/callback', _passport["default"].authenticate('twitter', {
+  failureRedirect: '/'
+}), /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(req, res) {
+    var user;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return db.getUser(req.user);
+
+          case 2:
+            user = _context.sent;
+
+            if (user.active) {
+              res.redirect('/');
+            } else {
+              res.redirect('/profile/');
+            }
+
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function (_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}());
 app.get('/logout', function (req, res) {
   req.logout();
   res.redirect('/');