Now handling user registration through Passport instead of GraphQL. Just so we don't have to reimplement the whole user workflow.

Author: clintonwoo

Diff for: src/data/Schema.js

@@ -234,14 +234,14 @@ export const resolvers = {
       return context.NewsItem.hideNewsItem(id, context.userId);
     },
 
-    submitNewsItem: (_, args, context) => {
+    submitNewsItem: (_, newsItem, context) => {
       if (!context.userId) throw new Error('Must be logged in to submit a news item.');
-      return context.NewsItem.submitNewsItem({ ...args, submitterId: context.userId });
+      return context.NewsItem.submitNewsItem({ ...newsItem, submitterId: context.userId });
     },
 
-    registerUser: (_, args, context) => {
+    registerUser: (_, user, context) => {
       if (context.userId) throw new Error('Logged in user cannot register a user');
-      return context.User.registerUser(args);
+      return context.User.registerUser(user);
     },
   },
 

Diff for: src/pages/login.js

@@ -88,7 +88,7 @@ const Page = ({ registerUser, url }) => {
           </tbody>
         </table>
         <br />
-        <input type="submit" value="create account" onClick={() => registerUser(user, pass)} />
+        <input type="submit" value="create account" /* onClick={() => registerUser(user, pass)} */ />
       </form>
     </Blank>
   );

Diff for: src/server.js

@@ -84,8 +84,13 @@ app.prepare()
     server.use(passport.session());
 
     server.post('/login', (req, res, next) => {
-      if (req.body.creating) req.session.returnTo = `${req.body.goto}${req.body.username}`;
-      else req.session.returnTo = req.body.goto;
+      if (req.body.creating && !req.user) {
+        User.registerUser({
+          id: req.body.username,
+          password: req.body.password,
+        });
+        req.session.returnTo = `${req.body.goto}${req.body.username}`;
+      } else req.session.returnTo = req.body.goto;
       next();
     }, passport.authenticate(
       'local',