From 53347571e6f44ed9a961b569bb81893fde4789c1 Mon Sep 17 00:00:00 2001 From: spzSource Date: Sat, 2 Jul 2016 19:42:13 +0300 Subject: [PATCH 1/2] [adal-angular]: add postLogoutRedirectUri and code style fix --- adal-angular/adal.d.ts | 44 ++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/adal-angular/adal.d.ts b/adal-angular/adal.d.ts index 1c60cbf6ef..a896d687ec 100644 --- a/adal-angular/adal.d.ts +++ b/adal-angular/adal.d.ts @@ -13,29 +13,30 @@ declare module 'adal' { declare namespace adal { interface Config { - tenant?: string, - clientId: string, - redirectUri?: string, - cacheLocation?: string, - displayCall?: (urlNavigate: string) => any, - correlationId?: string, - loginResource?: string, - resource?: string - endpoints?: any // If you need to send CORS api requests. - extraQueryParameter?: string + tenant?: string; + clientId: string; + redirectUri?: string; + cacheLocation?: string; + displayCall?: (urlNavigate: string) => any; + correlationId?: string; + loginResource?: string; + resource?: string; + endpoints?: any; // If you need to send CORS api requests. + extraQueryParameter?: string; + postLogoutRedirectUri?: string; // redirect url after succesful logout operation } interface User { - userName: string, - profile: any + userName: string; + profile: any; } interface RequestInfo { - valid: boolean, - parameters: any, - stateMatch: boolean, - stateResponse: string, - requestType: string + valid: boolean; + parameters: any; + stateMatch: boolean; + stateResponse: string; + requestType: string; } interface Logging { @@ -64,6 +65,10 @@ declare namespace adal { * Saves the resulting Idtoken in localStorage. */ login(): void; + + /** + * Indicates whether login is in progress now or not. + */ loginInProgress(): boolean; /** @@ -147,6 +152,11 @@ declare namespace adal { */ getResourceForEndpoint(endpoint: string): string; + /** + * Handles redirection after login operation. + * Gets access token from url and saves token to the (local/session) storage + * or saves error in case unsuccessful login. + */ handleWindowCallback(): void; log(level: number, message: string, error: any): void; From 690e468d4951f629983b36c0970eafb25b2269c8 Mon Sep 17 00:00:00 2001 From: spzSource Date: Sat, 2 Jul 2016 19:48:51 +0300 Subject: [PATCH 2/2] [adal-angular]: add tests for a new properties --- adal-angular/adal-tests.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adal-angular/adal-tests.ts b/adal-angular/adal-tests.ts index 3b9e46c961..db984d95ba 100644 --- a/adal-angular/adal-tests.ts +++ b/adal-angular/adal-tests.ts @@ -20,4 +20,6 @@ Logging.level = 4; auth.info("Logging message"); -var userName: string = auth.getCachedUser().userName; \ No newline at end of file +var userName: string = auth.getCachedUser().userName; +var postLogoutRedirectUrl = auth.config.postLogoutRedirectUri; +var isValidRequest = auth.getRequestInfo('hash').valid; \ No newline at end of file