-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
feat: Travelperk Guard #1132
Merged
Merged
feat: Travelperk Guard #1132
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
83dcfc6
feat: Travelperk Guard
anishfyle 25d79bf
lint fix
anishfyle 32be093
token guard
anishfyle 5165d08
lint fix
anishfyle edfafdc
fix
anishfyle 7a8a91f
Merge branch 'master' into travelperk-cred-handle-expiry
anishfyle 4be6423
Merge branch 'master' into travelperk-cred-handle-expiry
anishfyle 39cb013
pr comments
anishfyle e49bb64
Merge branch 'master' into travelperk-cred-handle-expiry
anishfyle 2e27664
make cacheable and catch error
anishfyle c1bfcbd
lint fix
anishfyle 27d567c
fixes for export settings wgs
anishfyle 286d24f
fix lint
anishfyle 68be07e
minor fixes for wgs
anishfyle 043ab34
fix tests
anishfyle 491d1bd
skip flaky
anishfyle File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import { TestBed } from '@angular/core/testing'; | ||
import { CanActivateFn } from '@angular/router'; | ||
|
||
import { travelperkTokenGuard } from './travelperk-token.guard'; | ||
|
||
describe('travelperkTokenGuard', () => { | ||
const executeGuard: CanActivateFn = (...guardParameters) => | ||
TestBed.runInInjectionContext(() => travelperkTokenGuard(...guardParameters)); | ||
|
||
beforeEach(() => { | ||
TestBed.configureTestingModule({}); | ||
}); | ||
|
||
it('should be created', () => { | ||
expect(executeGuard).toBeTruthy(); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
import { Injectable } from '@angular/core'; | ||
import { Router, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; | ||
import { Observable, catchError, map, throwError } from 'rxjs'; | ||
import { WorkspaceService } from '../services/common/workspace.service'; | ||
import { TravelperkService } from '../services/travelperk/travelperk.service'; | ||
import { globalCacheBusterNotifier } from 'ts-cacheable'; | ||
import { IntegrationsToastService } from '../services/common/integrations-toast.service'; | ||
import { TravelPerkOnboardingState, ToastSeverity } from '../models/enum/enum.model'; | ||
|
||
@Injectable({ | ||
providedIn: 'root' | ||
}) | ||
export class TravelperkTokenGuard { | ||
constructor( | ||
private travelperkService: TravelperkService, | ||
private router: Router, | ||
private toastService: IntegrationsToastService, | ||
private workspaceService: WorkspaceService | ||
) { } | ||
|
||
canActivate( | ||
route: ActivatedRouteSnapshot, | ||
state: RouterStateSnapshot | ||
): Observable<boolean> { | ||
const workspaceId = this.workspaceService.getWorkspaceId(); | ||
|
||
if (!workspaceId) { | ||
this.router.navigateByUrl('workspaces'); | ||
return throwError(() => new Error('Workspace not found')); | ||
} | ||
anishfyle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
return this.travelperkService.getTravelperkData().pipe( | ||
anishfyle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
map(() => true), | ||
catchError(error => { | ||
if (error.status === 400) { | ||
globalCacheBusterNotifier.next(); | ||
this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Oops! Your TravelPerk connection expired, please connect again'); | ||
|
||
const onboardingState = this.workspaceService.getOnboardingState(); | ||
if (onboardingState !== TravelPerkOnboardingState.COMPLETE) { | ||
this.router.navigateByUrl('integrations/travelperk/onboarding/landing'); | ||
} else { | ||
this.router.navigateByUrl('integrations/travelperk/onboarding/landing'); | ||
} | ||
anishfyle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
return throwError(() => error); | ||
}) | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add return type for getTravelperkTokenHealth response
The service method's response type is
{}
. Consider creating an interface for better type safety.