fix: redirect url

Author: annahassel

schemas/config.json

@@ -530,9 +530,6 @@
               },
               "profileHandler": {
                 "type": "object"
-              },
-              "redirectUrl": {
-                "type": "string"
               }
             }
           }

src/actions/oauth/upgrade.js

@@ -42,7 +42,8 @@ async function upgrade(request) {
 
   if (provider === 'apple') {
     try {
-      const tokenResponse = await validateGrantCode(providerSettings, token);
+      const redirectUrl = transportRequest.url.href.replace(/\/upgrade$/, '/apple');
+      const tokenResponse = await validateGrantCode(providerSettings, token, redirectUrl);
       credentials = await profile(providerSettings, tokenResponse);
       credentials.query = query;
     } catch (error) {

src/auth/oauth/strategies/apple.js

@@ -85,8 +85,8 @@ async function getProfile(credentials, params) {
   return credentials;
 }
 
-async function validateGrantCode(providerSettings, code) {
-  const { provider, redirectUrl, clientId, clientSecret } = providerSettings;
+async function validateGrantCode(providerSettings, code, redirectUrl) {
+  const { provider, clientId, clientSecret } = providerSettings;
   const response = await httpRequest.post(provider.token, {
     form: {
       code,
@@ -110,7 +110,6 @@ function getProvider(options, server) {
     password,
     isSameSite,
     cookie,
-    redirectUrl,
   } = options;
 
   // adds the "code" parameter to the query string for bell to work correctly
@@ -121,7 +120,6 @@ function getProvider(options, server) {
     clientId,
     isSameSite,
     cookie,
-    redirectUrl,
     clientSecret: () => getSecretKey(teamId, clientId, keyId, privateKey),
     forceHttps: true,
     providerParams: {

src/configs/oauth.js

@@ -54,7 +54,6 @@ exports.oauth = {
       password: 'very-long-encryption-password-that-needs-to-be-changed',
       cookie: 'mf_bapp',
       isSameSite: 'Lax',
-      redirectUrl: 'https://ms-users.local/users/oauth/upgrade', // used for upgrade token only!
     },
   },
 };

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());