fix(authentication-oauth): Update OAuth redirect to handle user reque…

…sted redirect paths (#3186)
feathersjs · May 5, 2023 · 3742028 · 3742028
1 parent 42bd5e4
commit 3742028
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/authentication-oauth/src/strategy.ts b/packages/authentication-oauth/src/strategy.ts
@@ -96,7 +96,7 @@ export class OAuthStrategy extends AuthenticationBaseStrategy {
     }
 
     const redirectUrl = `${redirect}${queryRedirect}`
-    const separator = redirect.endsWith('?') ? '' : redirect.indexOf('#') !== -1 ? '?' : '#'
+    const separator = redirectUrl.endsWith('?') ? '' : redirect.indexOf('#') !== -1 ? '?' : '#'
     const authResult: AuthenticationResult = data
     const query = authResult.accessToken
       ? { access_token: authResult.accessToken }

diff --git a/packages/authentication-oauth/test/strategy.test.ts b/packages/authentication-oauth/test/strategy.test.ts
@@ -43,6 +43,14 @@ describe('@feathersjs/authentication-oauth/strategy', () => {
     )
     assert.strictEqual('/home/hi-there#access_token=testing', redirect)
 
+    redirect = await strategy.getRedirect(
+      { accessToken: 'testing' },
+      {
+        redirect: '/hi-there?'
+      }
+    )
+    assert.equal(redirect, '/home/hi-there?access_token=testing')
+
     redirect = await strategy.getRedirect(new Error('something went wrong'))
     assert.equal(redirect, '/home#error=something%20went%20wrong')