Title: Resolved issue with Beacon leader being null

graphql/resolvers.js

@@ -36,12 +36,20 @@ const resolvers = {
             return beacon;
         },
         group: async (_parent, { id }, { user }) => {
-            const group = await Group.findById(id).populate("leader members beacons");
-            if (!group) return new UserInputError("No group exists with that id.");
-            // return error iff user not in group
-            if (group.leader.id !== user.id && !group.members.includes(user))
-                return new Error("User should be a part of the group");
-            return group;
+            const group = await Group.findById(id).populate('leader members').populate({
+                path: 'beacons',
+                populate: {
+                  path: 'leader',
+                },
+              });
+
+              if (!group) return new UserInputError("No group exists with that id.");
+              // Check if the user is part of the group
+              if (group.leader.id !== user.id && !group.members.includes(user))
+                throw new Error("User should be a part of the group");
+
+              console.log(`group: ${group}`);
+              return group;
         },
         nearbyBeacons: async (_, { location }) => {
             // get active beacons
@@ -73,10 +81,39 @@ const resolvers = {
                     password: await bcrypt.hash(credentials.password, 10),
                 }),
             });
+            console.log(newUser);
             const userObj = await newUser.save();
             return userObj;
         },
 
+        oAuth: async (_parent, { userInput }) => {
+
+            const { name, email } = userInput;
+            let user = await User.findOne({ email });
+
+            if (!user) {
+                const newUser = new User({ name, email });
+                user = await newUser.save();
+            }
+
+            const anon = false;
+            const tokenPayload = {
+                "https://beacon.ccextractor.org": {
+                    anon,
+                    ...(email && { email }),
+                },
+            };
+
+            const token = jwt.sign(tokenPayload, process.env.JWT_SECRET, {
+                algorithm: "HS256",
+                subject: user._id.toString(),
+                expiresIn: "7d",
+            });
+
+            return token;
+        },
+
+
         login: async (_parent, { id, credentials }) => {
             if (!id && !credentials) return new UserInputError("One of ID and credentials required");
 
@@ -93,11 +130,10 @@ const resolvers = {
             let anon = true;
 
             if (credentials) {
-                const valid = email === user.email && (await bcrypt.compare(password, user.password));
+                const valid = (email === user.email && bcrypt.compare(password, user.password));
                 if (!valid) return new AuthenticationError("credentials don't match");
                 anon = false;
             }
-
             return jwt.sign(
                 {
                     "https://beacon.ccextractor.org": {

graphql/schema.js

@@ -104,6 +104,12 @@ const typeDefs = gql`
         hello: String
     }
 
+
+    input oAuthInput {
+        email: String
+        name: String
+    }
+
     type Mutation {
         """
         if start time not supplied, default is Date.now
@@ -115,6 +121,7 @@ const typeDefs = gql`
         one of ID or credentials required (ID for anon)
         """
         login(id: ID, credentials: AuthPayload): String
+        oAuth(userInput: oAuthInput): String
         joinBeacon(shortcode: String!): Beacon!
         updateBeaconLocation(id: ID!, location: LocationInput!): Beacon!
         updateUserLocation(id: ID!, location: LocationInput!): User!

index.mjs

@@ -14,7 +14,7 @@ import { permissions } from "./permissions/index.js";
 import pubsub from "./pubsub.js";
 
 const server = new ApolloServer({
-    schema: applyMiddleware(makeExecutableSchema({ typeDefs, resolvers }), permissions),
+    schema: applyMiddleware(makeExecutableSchema({ typeDefs, resolvers }),permissions),
     // schema: makeExecutableSchema({ typeDefs, resolvers }), // to temp disable shield on dev
     context: async ({ req, connection }) => {
         // initialize context even if it comes from subscription connection

permissions/index.js

@@ -8,6 +8,7 @@ const permissions = shield({
     },
     Mutation: {
         "*": isAuthenticated,
+        oAuth: not(isAuthenticated),
         register: not(isAuthenticated),
         login: not(isAuthenticated),
     },