fix: use appId as clientid in upgrade

Author: annahassel

src/auth/oauth/strategies/apple.js

@@ -97,7 +97,7 @@ async function validateGrantCode(providerSettings, code, redirectUrl) {
     form: {
       code,
       client_id: appId,
-      client_secret: clientSecret(appId),
+      client_secret: clientSecret({ withAppId: true }),
       grant_type: 'authorization_code',
       redirect_uri: redirectUrl,
     },
@@ -124,11 +124,15 @@ function getProvider(options, server) {
 
   return {
     password,
-    appId,
     clientId,
     isSameSite,
     cookie,
-    clientSecret: (cid) => getSecretKey(teamId, cid || clientId, keyId, privateKey),
+    clientSecret: ({ withAppId = false }) => getSecretKey(
+      teamId,
+      withAppId ? appId : clientId,
+      keyId,
+      privateKey
+    ),
     forceHttps: true,
     providerParams: {
       response_mode: 'form_post',

test/suites/actions/oauth/upgrade.apple.js

@@ -3,7 +3,7 @@ const request = require('request-promise');
 const Users = require('../../../../src');
 
 // @TODO stub
-describe.skip('oauth.upgrade action', function suite() {
+describe('oauth.upgrade action', function suite() {
   const service = new Users({ oauth: { providers: { apple: { enabled: true } } } });
 
   before(() => service.connect());