fix: params

Author: annahassel

src/actions/oauth/upgrade.js

@@ -1,11 +1,10 @@
 const { strict: assert } = require('assert');
-const Boom = require('@hapi/boom');
 
 const { ActionTransport } = require('@microfleet/plugin-router');
 
 const { oauthVerification, mserviceVerification } = require('../../auth/oauth');
 const formOAuthResponse = require('../../auth/oauth/utils/form-oauth-response');
-const { validateGrantCode } = require('../../auth/oauth/strategies/apple');
+const { upgradeAppleCode } = require('../../auth/oauth/strategies/apple');
 
 /**
  * @api {amqp} <prefix>.oauth.upgrade Upgardes existing SSO token to service-verified token
@@ -38,22 +37,14 @@ async function upgrade(request) {
     query.jwt = params.jwt;
   }
 
-  let credentials;
-
-  if (provider === 'apple') {
-    try {
-      const redirectUrl = transportRequest.url.href
-        .replace(/\/upgrade$/, '/apple')
-        .replace(/^http:\/\//, 'https://');
-      const tokenResponse = await validateGrantCode(providerSettings, token, redirectUrl);
-      credentials = await profile.call(providerSettings, { token, query }, tokenResponse);
-    } catch (error) {
-      throw Boom.internal(error);
-    }
-  } else {
-    // verifies token by retreiving profile
-    credentials = await profile.call(providerSettings, { token, query });
-  }
+  const credentials = provider === 'apple'
+    ? await upgradeAppleCode({
+      query,
+      providerSettings,
+      code: token,
+      redirectUrl: transportRequest.url.href.replace(/\/upgrade$/, '/apple').replace(/^http:\/\//, 'https://'),
+    })
+    : await profile.call(providerSettings, { token, query });
 
   // ensure its a shallow copy as we will mutate it later
   const oauthConfig = { ...this.config.oauth.providers[provider] };

src/auth/oauth/strategies/apple.js

@@ -2,6 +2,7 @@ const { sign, verify } = require('jsonwebtoken');
 const getJwksClient = require('jwks-rsa');
 const Bluebird = require('bluebird');
 const httpRequest = require('request-promise');
+const Boom = require('@hapi/boom');
 
 // @todo more options from config
 const jwksClient = getJwksClient({
@@ -144,8 +145,31 @@ function getProvider(options, server) {
   };
 }
 
+async function upgradeAppleCode({ providerSettings, code, query, redirectUrl }) {
+  const { profile } = providerSettings.provider;
+
+  try {
+    const tokenResponse = await validateGrantCode(providerSettings, code, redirectUrl);
+    const credentials = await profile.call(
+      providerSettings,
+      {
+        query,
+        token: tokenResponse.access_token,
+        refreshToken: tokenResponse.refresh_token,
+        expiresIn: tokenResponse.expires_in,
+      },
+      tokenResponse
+    );
+
+    return credentials;
+  } catch (error) {
+    throw Boom.internal(error);
+  }
+}
+
 module.exports = {
   transformAccountToResponseFormat,
   validateGrantCode,
+  upgradeAppleCode,
   options: getProvider,
 };