Browse Source

fix(auth): add uri decoding

pull/4711/head
KenTandrian 3 months ago
parent
commit
d5941a973e
  1. 2
      apps/client/src/app/app-routing.module.ts
  2. 16
      apps/client/src/app/core/auth.guard.ts
  3. 2
      apps/client/src/app/core/paths.ts

2
apps/client/src/app/app-routing.module.ts

@ -100,7 +100,7 @@ const routes: Routes = [
import('./pages/open/open-page.module').then((m) => m.OpenPageModule) import('./pages/open/open-page.module').then((m) => m.OpenPageModule)
}, },
{ {
path: paths.public, path: paths.p,
loadChildren: () => loadChildren: () =>
import('./pages/public/public-page.module').then( import('./pages/public/public-page.module').then(
(m) => m.PublicPageModule (m) => m.PublicPageModule

16
apps/client/src/app/core/auth.guard.ts

@ -17,13 +17,13 @@ import { paths } from './paths';
export class AuthGuard { export class AuthGuard {
private static PUBLIC_PAGE_ROUTES = [ private static PUBLIC_PAGE_ROUTES = [
`/${paths.about}`, `/${paths.about}`,
'/blog', `/${paths.blog}`,
'/demo', `/${paths.demo}`,
`/${paths.faq}`, `/${paths.faq}`,
`/${paths.features}`, `/${paths.features}`,
`/${paths.markets}`, `/${paths.markets}`,
'/open', `/${paths.open}`,
'/p', `/${paths.p}`,
`/${paths.pricing}`, `/${paths.pricing}`,
`/${paths.register}`, `/${paths.register}`,
`/${paths.resources}` `/${paths.resources}`
@ -52,13 +52,13 @@ export class AuthGuard {
this.router.navigate(['/demo']); this.router.navigate(['/demo']);
resolve(false); resolve(false);
} else if (utmSource === 'trusted-web-activity') { } else if (utmSource === 'trusted-web-activity') {
this.router.navigate(['/' + $localize`register`]); this.router.navigate(['/' + paths.register]);
resolve(false); resolve(false);
} else if ( } else if (
AuthGuard.PUBLIC_PAGE_ROUTES.filter((publicPageRoute) => { AuthGuard.PUBLIC_PAGE_ROUTES.some((publicPageRoute) => {
const [, url] = state.url.split('/'); const [, url] = decodeURIComponent(state.url).split('/');
return `/${url}` === publicPageRoute; return `/${url}` === publicPageRoute;
})?.length > 0 })
) { ) {
resolve(true); resolve(true);
return EMPTY; return EMPTY;

2
apps/client/src/app/core/paths.ts

@ -18,8 +18,8 @@ export const paths = {
marketData: 'market-data', marketData: 'market-data',
membership: 'membership', membership: 'membership',
open: 'open', open: 'open',
p: 'p',
portfolio: 'portfolio', portfolio: 'portfolio',
public: 'p',
settings: 'settings', settings: 'settings',
start: 'start', start: 'start',
summary: 'summary', summary: 'summary',

Loading…
Cancel
Save