Skip to content

Commit 4d2705b

Browse files
edsuedsu
committed
new release
1 parent 3050cd1 commit 4d2705b

9 files changed

Lines changed: 70 additions & 31 deletions

‎dist/archive/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
</head>
2020
<body>
2121
<div id="app"></div>
22-
<script type="text/javascript" src="main-6613e4913d732009432c.js"></script></body>
22+
<script type="text/javascript" src="main-7f2e565d97814be5dcdd.js"></script></body>
2323
</html>

‎dist/archive/main-6613e4913d732009432c.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/archive/main-6613e4913d732009432c.js renamed to dist/archive/main-7f2e565d97814be5dcdd.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/archive/main-7f2e565d97814be5dcdd.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/client/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
</head>
1919
<body>
2020
<div id="app"></div>
21-
<script type="text/javascript" src="/main-e7b081c34806c044fbe6.js"></script></body>
21+
<script type="text/javascript" src="/main-2ed11e2461153c775e36.js"></script></body>
2222
</html>

dist/client/main-e7b081c34806c044fbe6.js renamed to dist/client/main-2ed11e2461153c775e36.js

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/client/main-e7b081c34806c044fbe6.js.map renamed to dist/client/main-2ed11e2461153c775e36.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/server/api.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,16 @@ app.get('/settings', /*#__PURE__*/function () {
168168
case 2:
169169
settings = _context3.sent;
170170

171-
if (!settings || !req.user) {
172-
if (!req.user || !req.user.isSuperUser) {
173-
delete settings.appKey;
174-
delete settings.appSecret;
175-
}
176-
177-
res.json(settings);
171+
// if they aren't logged in or the they're not an admin
172+
// be sure to delete the app key settings!
173+
if (!req.user || req.user && !req.user.isSuperUser) {
174+
delete settings.appKey;
175+
delete settings.appSecret;
178176
}
179177

180-
case 4:
178+
res.json(settings);
179+
180+
case 5:
181181
case "end":
182182
return _context3.stop();
183183
}

‎dist/server/auth.js‎

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
44

5+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
6+
7+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
8+
59
var _express = _interopRequireDefault(require("express"));
610

711
var _passport = _interopRequireDefault(require("passport"));
@@ -21,8 +25,9 @@ var activateKeys = function activateKeys() {
2125
consumerSecret: settings.appSecret,
2226
callbackURL: '/auth/twitter/callback',
2327
proxy: true,
24-
includeEmail: true
25-
}, function (token, tokenSecret, profile, cb) {
28+
includeEmail: true,
29+
passReqToCallback: true
30+
}, function (req, token, tokenSecret, profile, cb) {
2631
db.getUserByTwitterUserId(profile.id).then(function (user) {
2732
if (!user) {
2833
var newUser = {
@@ -64,12 +69,46 @@ _passport["default"].deserializeUser(function (userId, done) {
6469

6570
app.use(_passport["default"].initialize());
6671
app.use(_passport["default"].session());
67-
app.get('/twitter', _passport["default"].authenticate('twitter'));
68-
app.get('/twitter/callback', _passport["default"].authenticate('twitter', {
69-
failureRedirect: '/login'
70-
}), function (req, res) {
71-
res.redirect('/profile/');
72+
app.get('/twitter', function (req, res, next) {
73+
_passport["default"].authenticate('twitter', function (err) {
74+
if (err) {
75+
return res.redirect("/settings/?error=".concat(encodeURIComponent(err.message)));
76+
}
77+
})(req, res, next);
7278
});
79+
app.get('/twitter/callback', _passport["default"].authenticate('twitter', {
80+
failureRedirect: '/'
81+
}), /*#__PURE__*/function () {
82+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(req, res) {
83+
var user;
84+
return _regenerator["default"].wrap(function _callee$(_context) {
85+
while (1) {
86+
switch (_context.prev = _context.next) {
87+
case 0:
88+
_context.next = 2;
89+
return db.getUser(req.user);
90+
91+
case 2:
92+
user = _context.sent;
93+
94+
if (user.active) {
95+
res.redirect('/');
96+
} else {
97+
res.redirect('/profile/');
98+
}
99+
100+
case 4:
101+
case "end":
102+
return _context.stop();
103+
}
104+
}
105+
}, _callee);
106+
}));
107+
108+
return function (_x, _x2) {
109+
return _ref.apply(this, arguments);
110+
};
111+
}());
73112
app.get('/logout', function (req, res) {
74113
req.logout();
75114
res.redirect('/');

0 commit comments

Comments
 (0)