Skip to content

Fix: handle routes without path segments #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PatrickSchnoop wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −12
Open

Fix: handle routes without path segments #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/okta/okta.guard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
Router,
NavigationStart,
NavigationStart,
Event,
CanLoad,
Route,
Expand All @@ -36,10 +36,10 @@ export class OktaAuthGuard implements CanActivate, CanActivateChild, CanLoad {


constructor(
@Inject(OKTA_CONFIG) private config: OktaConfig,
@Inject(OKTA_AUTH) private oktaAuth: OktaAuth,
@Inject(OKTA_CONFIG) private config: OktaConfig,
@Inject(OKTA_AUTH) private oktaAuth: OktaAuth,
private injector: Injector
) {
) {
this.onAuthRequired = this.config.onAuthRequired;

// Unsubscribe updateAuthStateListener when route change
Expand All @@ -59,7 +59,7 @@ export class OktaAuthGuard implements CanActivate, CanActivateChild, CanLoad {
return true;
}

const originalUri = segments[0].path;
const originalUri = segments.length > 0 ? segments[0].path : '';
await this.handleLogin(originalUri);

return false;
Expand Down
19 changes: 12 additions & 7 deletions test/spec/guard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import {
OKTA_CONFIG,
} from '../../src/okta-angular';
import { AuthRequiredFunction } from '../../src/okta/models/okta.config';
import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
Router,
RouterState,
Route,
UrlSegment
import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
Router,
RouterState,
Route,
UrlSegment
} from '@angular/router';
import { Injector } from '@angular/core';
import { OktaAuth } from '@okta/okta-auth-js';
Expand Down Expand Up @@ -102,6 +102,11 @@ describe('Angular auth guard', () => {
expect(oktaAuth.setOriginalUri).toHaveBeenCalledWith('http://fake.url/path?query=foo&bar=baz#hash=foo');
});

it('calls "setOriginalUri" without route segments', async () => {
await guard.canLoad(route, []);
expect(oktaAuth.setOriginalUri).toHaveBeenCalledWith('');
});

it('onAuthRequired can be set on route', async () => {
const mockFn = jest.fn();
route.data = {
Expand Down