fix(authentication-oauth): Fix regression using incorrect callback and redirect_uri (#2631)

johnheenan · web-flow · commit 43d8a082d7e1 · 2022-05-23T09:58:03.000-07:00
diff --git a/packages/authentication-oauth/src/index.ts b/packages/authentication-oauth/src/index.ts
@@ -41,14 +41,14 @@ export const setup = (options: OauthSetupSettings) => (app: Application) => {
     }
   }
 
-  const grant = defaultsDeep({}, omit(oauth, ['redirect', 'origins']), {
+  const grant = defaultsDeep({
     defaults: {
       prefix,
-      origin: `${protocol}://${host}`,
-      transport: 'session',
+      origin: `${oauth?.defaults?.protocol ?? protocol}://${oauth?.defaults?.host ?? host}`,
+      transport:  oauth?.defaults?.transport ?? 'session',
       response: ['tokens', 'raw', 'profile']
     }
-  });
+  }, omit(oauth, ['redirect', 'origins']));
 
   const getUrl = (url: string) => {
     const { defaults } = grant;

Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,14 @@ export const setup = (options: OauthSetupSettings) => (app: Application) => {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- const grant = defaultsDeep({}, omit(oauth, ['redirect', 'origins']), {`
	`44`	`+ const grant = defaultsDeep({`
`45`	`45`	`defaults: {`
`46`	`46`	`prefix,`
`47`		- origin: `${protocol}://${host}`,
`48`		`- transport: 'session',`
	`47`	+ origin: `${oauth?.defaults?.protocol ?? protocol}://${oauth?.defaults?.host ?? host}`,
	`48`	`+ transport: oauth?.defaults?.transport ?? 'session',`
`49`	`49`	`response: ['tokens', 'raw', 'profile']`
`50`	`50`	`}`
`51`		`- });`
	`51`	`+ }, omit(oauth, ['redirect', 'origins']));`
`52`	`52`
`53`	`53`	`const getUrl = (url: string) => {`
`54`	`54`	`const { defaults } = grant;`