Use promise-based version of W3C API library (#238)

in places where we already use promises, at least

Author: dontcallmedom

package.json

@@ -57,7 +57,7 @@
     "express": "4.15.3",
     "express-session": "1.15.3",
     "express-winston": "2.4.0",
-    "node-w3capi": "1.10.1",
+    "node-w3capi": "^1.11.0",
     "nodemailer": "6.4.16",
     "nodemailer-mock-transport": "1.3.0",
     "object-assign": "4.1.1",

pr-check.js

@@ -15,8 +15,7 @@ let store, log;
 async function findW3CUserFromGithub(user) {
   log.info("Looking for github user with id " + user.ghID + " in W3C API");
   try {
-    // can't easily promisify w3c API :(
-    let w3cuser = await new Promise((res, rej) => w3c.user({type: 'github', id: user.ghID}).fetch((err, u) => { if (err) return rej(err); return res(u);}));
+    let w3cuser = await  w3c.user({type: 'github', id: user.ghID}).fetch();
     log.info(JSON.stringify(w3cuser, null, 2));
     await doAsync(store).mergeOnUser(user.username, {
       w3cid:  w3cuser.id,
@@ -180,14 +179,11 @@ function prChecker(config, argLog, argStore, GH, mailer) {
 
           let groups = [];
 
-          for (g of repoGroups) {
+          for (let g of repoGroups) {
             // get group type and shortname
             try {
-              await new Promise((res, rej) => w3c.group(g).fetch((err, group) => {
-                if (err) return rej(err);
-                groups.push({id: g, type: types[group.type], shortname: group.shortname});
-                res();
-              }));
+              const group = await w3c.group(g).fetch();
+              groups.push({id: g, type: types[group.type], shortname: group.shortname});
             } catch (err) {
               return cb(err);
             }
@@ -208,7 +204,7 @@ function prChecker(config, argLog, argStore, GH, mailer) {
               if (pr.repoId) {
                 let nplc;
                 try {
-                  nplc = await new Promise((res, rej) => w3c.nplc({repoId: pr.repoId, pr: pr.num}).fetch((err, n) => { if (err) return rej(err); return res(n);}));
+                  nplc = await w3c.nplc({repoId: pr.repoId, pr: pr.num}).fetch();
                 } catch (err) {
                   // Non-participant licensing contribution doesn't exist
                   pr.contribStatus[username] = "not in group";

w3c-ipr.js

@@ -1,62 +1,45 @@
+const doAsync = require('doasync'); // rather than utils.promisy to get "free" support for object methods
+
 const fromUrlToId = url => url.replace(/.*\//, "");
 
 module.exports = async function iprcheck(w3c, w3cprofileid, name, w3cgroups, store, cb) {
-  return Promise.all(
-    w3cgroups.map(
-      ({id, type, shortname}) => new Promise((res, rej) => {
-        store.getGroup(id, function(err, group) {
-          if (err) return rej(err);
-          w3c.user(w3cprofileid)
-            .participations()
-            .fetch({embed: true},
-                   function(err, participations) {
-                     if (err) return rej(err);
-                     for (var i = 0 ; i < participations.length; i++) {
-                       var p = participations[i];
-                       var org = p._links.organization;
-                       var affiliation = p.individual ? {id: w3cprofileid, name: name} : {id: fromUrlToId(org.href), name: org.title};
-                       if (p._links.group.href === `https://api.w3.org/groups/${type}/${shortname}`) {
-                         return res({ok: true, affiliation: affiliation});
-                       }
-                     }
-                     // If we reach here,
-                     // the user is not participating directly in the group
-                     // For non WGs, game over
-                     if (group.groupType != "WG") {
-                       return res({ok: false});
-                     }
-                     // For WGs, we check if the user is affiliated
-                     // with an organization that is participating
-                     w3c.group({type, shortname})
-                       .participations()
-                       .fetch({embed: true}, function(err, participations) {
-                         if (err) return rej(err);
-                         var orgids = participations
-                             .filter(p => !p.individual)
-                             .map(p => fromUrlToId(p._links.organization.href));
-                         w3c.user(w3cprofileid)
-                           .affiliations()
-                           .fetch(function(err, affiliations) {
-                             if (err) return rej(err);
-                             var affids = affiliations.map(a => a ? fromUrlToId(a.href) : undefined);
-                             var intersection = orgids.filter(id =>  affids.includes(id));
-                             if (intersection.length) {
-                               var affiliationId = intersection[0];
-                               var affiliationName = affiliations.find(a => a.href == "https://api.w3.org/affiliations/" + affiliationId).title;
-                               return res({ok: true, affiliation: {id: affiliationId, name: affiliationName}});
-                             }
-                             return res({ok: false});
-                           });
-                       });
-                   });
-        })
-      })))
-    .then(results => {
-      for(let res of results) {
-        if (res.ok) {
-          return {affiliation: res.affiliation, ok: true};
-        }
+  for (let {id, type, shortname} of w3cgroups) {
+    const group = await doAsync(store).getGroup(id);
+    const participations = await w3c.user(w3cprofileid)
+          .participations()
+          .fetch({embed: true});
+    if (!participations) return {affiliation: null, ok: false};
+    for (let p of participations) {
+      const org = p._links.organization;
+      const affiliation = p.individual ? {id: w3cprofileid, name: name} : {id: fromUrlToId(org.href), name: org.title};
+      if (p._links.group.href === `https://api.w3.org/groups/${type}/${shortname}`) {
+        return {ok: true, affiliation: affiliation};
       }
-      return {affiliation: null, ok: false};
-    });
+    }
+    // If we reach here,
+    // the user is not participating directly in the group
+    // For non WGs, game over
+    if (group.groupType != "WG") {
+      continue;
+    }
+    // For WGs, we check if the user is affiliated
+    // with an organization that is participating
+    const orgParticipations = await w3c.group({type, shortname})
+          .participations()
+          .fetch({embed: true});
+    const orgids = orgParticipations
+        .filter(p => !p.individual)
+        .map(p => fromUrlToId(p._links.organization.href));
+    const affiliations = await w3c.user(w3cprofileid)
+          .affiliations()
+          .fetch();
+    const affids = affiliations.map(a => a ? fromUrlToId(a.href) : undefined);
+    const intersection = orgids.filter(id =>  affids.includes(id));
+    if (intersection.length) {
+      const affiliationId = intersection[0];
+      const affiliationName = affiliations.find(a => a.href == "https://api.w3.org/affiliations/" + affiliationId).title;
+      return {ok: true, affiliation: {id: affiliationId, name: affiliationName}};
+    }
+  }
+  return {affiliation: null, ok: false};
 };