Updates usage of co to async function in createScoreboardClient

src/online/scoreboard-system/authenticationFlow.js

@@ -1,4 +1,4 @@
-export function* loginByUsernamePassword(
+export async function loginByUsernamePassword(
   username,
   password,
   {
@@ -20,42 +20,41 @@ export function* loginByUsernamePassword(
   }
 ) {
   {
-    const { idToken } = yield* obtainIdToken()
+    const { idToken } = await obtainIdToken()
     log('Loading profile...')
-    yield ensureLink(idToken)
+    await ensureLink(idToken)
     return { idToken }
   }
 
-  function* obtainIdToken() {
+  async function obtainIdToken() {
     let triedEmail = false
     if (/@/.test(username)) {
       log('Authenticating using email...')
-      const email = username
-      const { idToken } = yield usernamePasswordLogin(email, password)
+      const { idToken } = await usernamePasswordLogin(username, password)
       if (idToken) {
         log('Authenticated using email.')
         return { idToken }
       }
     }
 
     log('Resolving player...')
-    const { playerId } = yield resolvePlayerId(username)
+    const { playerId } = await resolvePlayerId(username)
     if (!playerId) {
       throw new Error(
         triedEmail ? 'Invalid email or password' : 'Player not registered'
       )
     }
 
     log('Authenticating player...')
-    const { idToken } = yield usernamePasswordLogin(playerId, password)
+    const { idToken } = await usernamePasswordLogin(playerId, password)
     if (!idToken) {
       throw new Error('Invalid password')
     }
     return { idToken }
   }
 }
 
-export function* signUp(
+export async function signUp(
   username,
   email,
   password,
@@ -81,22 +80,22 @@ export function* signUp(
   }
 ) {
   log('Checking player name availability...')
-  const available = yield checkPlayerNameAvailability(username)
+  const available = await checkPlayerNameAvailability(username)
 
   if (!available) {
     throw new Error('Player name already taken')
   }
 
   log('Registering player name...')
-  const playerId = yield reservePlayerId(username)
+  const playerId = await reservePlayerId(username)
 
   log('Creating account...')
-  const { idToken } = yield userSignUp(playerId, email, password, username)
+  const { idToken } = await userSignUp(playerId, email, password, username)
   if (!idToken) {
     throw new Error('Cannot sign up (unknown error)')
   }
 
   log('Linking account...')
-  yield ensureLink(idToken)
+  await ensureLink(idToken)
   return { idToken }
 }

src/online/scoreboard-system/createScoreboardClient.js

@@ -1,5 +1,4 @@
 import axios from 'axios'
-import co from 'co'
 import invariant from 'invariant'
 
 import * as authenticationFlow from './authenticationFlow'
@@ -108,27 +107,25 @@ export default function createScoreboardClient({
     )
   }
 
-  function resolvePlayerId(playerName) {
-    return Promise.resolve(
-      graphql({
-        query: `
-          query resolvePlayerId ($name: String!) {
-            player (name: $name) {
-              id
-            }
+  async function resolvePlayerId(playerName) {
+    const result = await graphql({
+      query: `
+        query resolvePlayerId ($name: String!) {
+          player (name: $name) {
+            id
           }
-        `,
-        variables: {
-          name: playerName,
-        },
-      }).then(result => {
-        if (result.data.player === null) {
-          return { error: 'Player not found...' }
-        } else {
-          return { playerId: result.data.player.id }
         }
-      })
-    )
+      `,
+      variables: {
+        name: playerName,
+      },
+    })
+
+    if (result.data.player === null) {
+      return { error: 'Player not found...' }
+    } else {
+      return { playerId: result.data.player.id }
+    }
   }
 
   function reservePlayerId(playerName) {
@@ -209,46 +206,39 @@ export default function createScoreboardClient({
     entry ${ENTRY}
   }`
 
-  const scoreboardClient = {
-    signUp({ username, password, email }) {
+  return {
+    async signUp({ username, password, email }) {
       invariant(typeof username === 'string', 'username must be a string')
       invariant(typeof password === 'string', 'password must be a string')
       invariant(typeof email === 'string', 'email must be a string')
-      // TODO [#632]: Convert the `signUp` method to async function (instead of using `co`) in src/online/scoreboard-system/createScoreboardClient.js
-      // See issue #575 for more details.
-      return co(function*() {
-        const { idToken } = yield* authenticationFlow.signUp(
-          username,
-          email,
-          password,
-          {
-            log: message => log('[signUp]', message),
-            userSignUp,
-            checkPlayerNameAvailability,
-            reservePlayerId,
-            ensureLink,
-          }
-        )
-        return { playerToken: yield resolvePlayerTokenFromIdToken(idToken) }
-      })
+      const { idToken } = await authenticationFlow.signUp(
+        username,
+        email,
+        password,
+        {
+          log: message => log('[signUp]', message),
+          userSignUp,
+          checkPlayerNameAvailability,
+          reservePlayerId,
+          ensureLink,
+        }
+      )
+      return { playerToken: await resolvePlayerTokenFromIdToken(idToken) }
     },
-    loginByUsernamePassword({ username, password }) {
+    async loginByUsernamePassword({ username, password }) {
       invariant(typeof username === 'string', 'username must be a string')
       invariant(typeof password === 'string', 'password must be a string')
-      // TODO [#633]: Convert the `loginByUsernamePassword` method to async function (instead of using `co`) in src/online/scoreboard-system/createScoreboardClient.js
-      return co(function*() {
-        const { idToken } = yield* authenticationFlow.loginByUsernamePassword(
-          username,
-          password,
-          {
-            log: message => log('[loginByUsernamePassword]', message),
-            usernamePasswordLogin,
-            resolvePlayerId,
-            ensureLink,
-          }
-        )
-        return { playerToken: yield resolvePlayerTokenFromIdToken(idToken) }
-      })
+      const { idToken } = await authenticationFlow.loginByUsernamePassword(
+        username,
+        password,
+        {
+          log: message => log('[loginByUsernamePassword]', message),
+          usernamePasswordLogin,
+          resolvePlayerId,
+          ensureLink,
+        }
+      )
+      return { playerToken: await resolvePlayerTokenFromIdToken(idToken) }
     },
     submitScore({ playerToken, md5, playMode, input }) {
       return graphql({
@@ -334,8 +324,6 @@ export default function createScoreboardClient({
       }).then(result => result.data.renewPlayerToken.playerToken)
     },
   }
-
-  return scoreboardClient
 }
 
 function coerceAuth0ErrorToErrorObject(err) {