From 9078dee5392b016232a5bbd4722b5ee71b19eee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kor=C5=BCel?= Date: Sun, 19 Feb 2017 18:05:53 +0100 Subject: [PATCH] Added automatic token renewal feature and relased new plugin version. --- README.md | 7 ++- dist/amd/oauth-service.js | 63 +++++++++++++++++------ dist/amd/oauth-token-service.js | 9 +++- dist/amd/url-hash-service.js | 10 ++-- dist/commonjs/oauth-service.js | 63 +++++++++++++++++------ dist/commonjs/oauth-token-service.js | 9 +++- dist/commonjs/url-hash-service.js | 10 ++-- dist/dts/oauth-service.d.ts | 3 ++ dist/dts/oauth-token-service.d.ts | 1 + dist/dts/url-hash-service.d.ts | 4 +- dist/es6/oauth-service.js | 63 +++++++++++++++++------ dist/es6/oauth-token-service.js | 9 +++- dist/es6/url-hash-service.js | 10 ++-- dist/system/oauth-service.js | 63 +++++++++++++++++------ dist/system/oauth-token-service.js | 9 +++- dist/system/url-hash-service.js | 10 ++-- dist/ts/oauth-service.ts | 76 +++++++++++++++++++++------- dist/ts/oauth-token-service.ts | 9 +++- dist/ts/url-hash-service.ts | 8 +-- package.json | 2 +- src/oauth-service.ts | 76 +++++++++++++++++++++------- src/oauth-token-service.ts | 9 +++- src/url-hash-service.ts | 8 +-- 23 files changed, 389 insertions(+), 142 deletions(-) diff --git a/README.md b/README.md index e20630d..77294f4 100644 --- a/README.md +++ b/README.md @@ -224,6 +224,7 @@ export interface OAuthConfig { state?: string; redirectUri?: string; alwaysRequireLogin?: boolean; + autoTokenRenewal?: boolean; } export interface OAuthTokenConfig { @@ -236,7 +237,7 @@ export interface OAuthTokenConfig { } ``` -## Added support for both aurelia-fetch-client and aurelia-http-client +## Added support for both aurelia-fetch-client and aurelia-http-client (v.0.2.0) Currently, aurelia-oauth provides basic feature of adding authorization header to every request by using custom interceptor, which should work well with both client plugins. However, there is one slight difference in behaviour and in case of **aurelia-http-client** which has support for cancelling requests, plugin can abort request when checks that token has expired before the request was made. In both plugins the request response, which is passed in the promise chain contains additional flag **tokenExpired** in case that, was the reason request has failed. @@ -260,3 +261,7 @@ this.http.get('https://api.com') alert(reason.requestMessage.tokenExpired); }); ``` + +## Added feature: automatic token renewal (v.0.3.0) + +Automatic token renewal feature can help preventing application token from expiration. First, it tracks token expiration time and then 30 seconds before the token is going to expire, it will create invisible IFrame that can obtain new token from Identity Server login page. In some cases, obtaining new token will not be possible, therefore standard behaviour will occur i.e. invalidToken event broadcasting via EventAggregator. This feature is enabled by default, but could be disabled simply setting flag **autoTokenRenewal** to false when configuring OAuthService and invoking oauthService.configure() method. \ No newline at end of file diff --git a/dist/amd/oauth-service.js b/dist/amd/oauth-service.js index d32c410..ccab0d9 100644 --- a/dist/amd/oauth-service.js +++ b/dist/amd/oauth-service.js @@ -43,18 +43,7 @@ define(["require", "exports", "aurelia-event-aggregator", "aurelia-dependency-in return _this.oAuthTokenService.getToken(); }; this.login = function () { - var redirectUrl = _this.config.loginUrl + "?" + - ("response_type=" + _this.oAuthTokenService.config.name + "&") + - ("client_id=" + encodeURIComponent(_this.config.clientId) + "&") + - ("redirect_uri=" + encodeURIComponent(_this.config.redirectUri) + "&") + - ("nonce=" + encodeURIComponent(_this.getSimpleNonceValue())); - if (_this.config.scope) { - redirectUrl += "&scope=" + encodeURIComponent(_this.config.scope); - } - if (_this.config.state) { - redirectUrl += "&state=" + encodeURIComponent(_this.config.state); - } - window.location.href = redirectUrl; + window.location.href = _this.getRedirectUrl(); }; this.logout = function () { var redirectUrl = _this.config.logoutUrl + "?" + @@ -89,6 +78,9 @@ define(["require", "exports", "aurelia-event-aggregator", "aurelia-dependency-in window.location.href = _this.getBaseRouteUrl(); } _this.eventAggregator.publish(OAuthService_1.LOGIN_SUCCESS_EVENT, tokenData); + if (_this.config.autoTokenRenewal) { + _this.setAutomaticTokenRenewal(); + } } }; this.isLoginRequired = function (state) { @@ -96,8 +88,8 @@ define(["require", "exports", "aurelia-event-aggregator", "aurelia-dependency-in var routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false; return routeHasConfig ? routeRequiresLogin : _this.config.alwaysRequireLogin; }; - this.getTokenDataFromUrl = function () { - var hashData = _this.urlHashService.getHashData(); + this.getTokenDataFromUrl = function (hash) { + var hashData = _this.urlHashService.getHashData(hash); var tokenData = _this.oAuthTokenService.createToken(hashData); return tokenData; }; @@ -114,7 +106,8 @@ define(["require", "exports", "aurelia-event-aggregator", "aurelia-dependency-in logoutRedirectParameterName: 'post_logout_redirect_uri', scope: null, state: null, - alwaysRequireLogin: false + alwaysRequireLogin: false, + autoTokenRenewal: true }; } Object.defineProperty(OAuthService, "LOGIN_SUCCESS_EVENT", { @@ -127,6 +120,44 @@ define(["require", "exports", "aurelia-event-aggregator", "aurelia-dependency-in enumerable: true, configurable: true }); + OAuthService.prototype.getRedirectUrl = function () { + var redirectUrl = this.config.loginUrl + "?" + + ("response_type=" + this.oAuthTokenService.config.name + "&") + + ("client_id=" + encodeURIComponent(this.config.clientId) + "&") + + ("redirect_uri=" + encodeURIComponent(this.config.redirectUri) + "&") + + ("nonce=" + encodeURIComponent(this.getSimpleNonceValue())); + if (this.config.scope) { + redirectUrl += "&scope=" + encodeURIComponent(this.config.scope); + } + if (this.config.state) { + redirectUrl += "&state=" + encodeURIComponent(this.config.state); + } + return redirectUrl; + }; + OAuthService.prototype.setAutomaticTokenRenewal = function () { + var _this = this; + var tokenExpirationTime = this.oAuthTokenService.getTokenExpirationTime() * 1000; + setTimeout(function () { + var iFrame = document.createElement('iframe'); + iFrame.src = _this.getRedirectUrl(); + iFrame.style.display = 'none'; + iFrame.onload = function (event) { + try { + var hashWithNewToken = iFrame.contentWindow.location.hash; + document.body.removeChild(iFrame); + var tokenData = _this.getTokenDataFromUrl(hashWithNewToken); + if (tokenData) { + _this.oAuthTokenService.setToken(tokenData); + _this.setAutomaticTokenRenewal(); + } + } + catch (ex) { + document.body.removeChild(iFrame); + } + }; + document.body.appendChild(iFrame); + }, tokenExpirationTime); + }; return OAuthService; }()); OAuthService = OAuthService_1 = __decorate([ @@ -140,4 +171,4 @@ define(["require", "exports", "aurelia-event-aggregator", "aurelia-dependency-in var OAuthService_1; }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-service.ts"],"names":[],"mappings":"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","file":"oauth-service.js","sourcesContent":["import { EventAggregator } from 'aurelia-event-aggregator';\r\nimport { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport { OAuthTokenService, OAuthTokenData } from './oauth-token-service';\r\nimport UrlHashService from './url-hash-service';\r\nimport LocalStorageService from './local-storage-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nconst OAUTH_STARTPAGE_STORAGE_KEY: string = 'oauth.startPage';\r\n\r\nexport interface OAuthConfig {\r\n    loginUrl: string;\r\n    logoutUrl: string;\r\n    clientId: string;\r\n    logoutRedirectParameterName?: string;\r\n    scope?: string;\r\n    state?: string;\r\n    redirectUri?: string;\r\n    alwaysRequireLogin?: boolean;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthService {\r\n\r\n    public config: OAuthConfig;\r\n\r\n    private defaults: OAuthConfig;\r\n\r\n    public static get LOGIN_SUCCESS_EVENT(): string { return 'oauth:loginSuccess'; }\r\n    public static get INVALID_TOKEN_EVENT(): string { return 'oauth:invalidToken'; }\r\n\r\n    constructor(\r\n        private oAuthTokenService: OAuthTokenService,\r\n        private urlHashService: UrlHashService,\r\n        private localStorageService: LocalStorageService,\r\n        private eventAggregator: EventAggregator) {\r\n\r\n        this.defaults = {\r\n            loginUrl: null,\r\n            logoutUrl: null,\r\n            clientId: null,\r\n            logoutRedirectParameterName: 'post_logout_redirect_uri',\r\n            scope: null,\r\n            state: null,\r\n            alwaysRequireLogin: false\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthConfig): OAuthConfig => {\r\n        if (this.config) {\r\n            throw new Error('OAuthProvider already configured.');\r\n        }\r\n\r\n        // Remove trailing slash from urls.\r\n        if (config.loginUrl.substr(-1) === '/') {\r\n            config.loginUrl = config.loginUrl.slice(0, -1);\r\n        }\r\n\r\n        if (config.logoutUrl.substr(-1) === '/') {\r\n            config.logoutUrl = config.logoutUrl.slice(0, -1);\r\n        }\r\n\r\n        // Extend default configuration.\r\n        this.config = objectAssign(this.defaults, config);\r\n\r\n        // Redirect is set to current location by default\r\n        const existingHash = window.location.hash;\r\n        let pathDefault = window.location.href;\r\n\r\n        // Remove not needed parts from urls.\r\n        if (existingHash) {\r\n            pathDefault = pathDefault.replace(existingHash, '');\r\n        }\r\n\r\n        if (pathDefault.substr(-1) === '#') {\r\n            pathDefault = pathDefault.slice(0, -1);\r\n        }\r\n\r\n        this.config.redirectUri = config.redirectUri || pathDefault;\r\n\r\n        return config;\r\n    };\r\n\r\n    public isAuthenticated = (): boolean => {\r\n        return <any>this.oAuthTokenService.getToken();\r\n    };\r\n\r\n    public login = (): void => {\r\n        let redirectUrl = `${this.config.loginUrl}?` +\r\n            `response_type=${this.oAuthTokenService.config.name}&` +\r\n            `client_id=${encodeURIComponent(this.config.clientId)}&` +\r\n            `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` +\r\n            `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`;\r\n\r\n        if (this.config.scope) {\r\n            redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`;\r\n        }\r\n\r\n        if (this.config.state) {\r\n            redirectUrl += `&state=${encodeURIComponent(this.config.state)}`;\r\n        }\r\n\r\n        window.location.href = redirectUrl;\r\n    };\r\n\r\n    public logout = (): void => {\r\n        const redirectUrl = `${this.config.logoutUrl}?` +\r\n            `${this.config.logoutRedirectParameterName}=${encodeURIComponent(this.config.redirectUri)}`;\r\n\r\n        window.location.href = redirectUrl;\r\n        this.oAuthTokenService.removeToken();\r\n    };\r\n\r\n    public loginOnStateChange = (toState): boolean => {\r\n        if (toState && this.isLoginRequired(toState) && !this.isAuthenticated() && !this.getTokenDataFromUrl()) {\r\n\r\n            if (this.localStorageService.isStorageSupported()) {\r\n                let url = window.location.href;\r\n\r\n                if (!window.location.hash) {\r\n                    url = this.getBaseRouteUrl();\r\n                }\r\n\r\n                this.localStorageService.set<string>(OAUTH_STARTPAGE_STORAGE_KEY, url);\r\n            }\r\n\r\n            this.login();\r\n\r\n            return true;\r\n        }\r\n\r\n        return false;\r\n    };\r\n\r\n    public setTokenOnRedirect = (): void => {\r\n        const tokenData = this.getTokenDataFromUrl();\r\n\r\n        if (!this.isAuthenticated() && tokenData) {\r\n            this.oAuthTokenService.setToken(tokenData);\r\n\r\n            if (this.localStorageService.isStorageSupported() && this.localStorageService.get(OAUTH_STARTPAGE_STORAGE_KEY)) {\r\n                const startPage = this.localStorageService.get<string>(OAUTH_STARTPAGE_STORAGE_KEY);\r\n\r\n                this.localStorageService.remove(OAUTH_STARTPAGE_STORAGE_KEY);\r\n                window.location.href = startPage;\r\n            } else {\r\n                // Redirect to the base application route\r\n                window.location.href = this.getBaseRouteUrl();\r\n            }\r\n\r\n            this.eventAggregator.publish(OAuthService.LOGIN_SUCCESS_EVENT, tokenData);\r\n        }\r\n    };\r\n\r\n    private isLoginRequired = (state): boolean => {\r\n        const routeHasConfig = state.settings && state.settings.requireLogin !== undefined;\r\n        const routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false;\r\n\r\n        return routeHasConfig ? routeRequiresLogin : this.config.alwaysRequireLogin;\r\n    };\r\n\r\n    private getTokenDataFromUrl = (): OAuthTokenData => {\r\n        const hashData = this.urlHashService.getHashData();\r\n        const tokenData = this.oAuthTokenService.createToken(hashData);\r\n\r\n        return tokenData;\r\n    };\r\n\r\n    private getBaseRouteUrl = (): string => {\r\n        return window.location.origin + '/#/';\r\n    }\r\n\r\n    private getSimpleNonceValue = (): string => {\r\n        return ((Date.now() + Math.random()) * Math.random()).toString().replace('.', '');\r\n    }\r\n}"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-service.ts"],"names":[],"mappings":"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","file":"oauth-service.js","sourcesContent":["import { EventAggregator } from 'aurelia-event-aggregator';\r\nimport { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport { OAuthTokenService, OAuthTokenData } from './oauth-token-service';\r\nimport UrlHashService from './url-hash-service';\r\nimport LocalStorageService from './local-storage-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nconst OAUTH_STARTPAGE_STORAGE_KEY: string = 'oauth.startPage';\r\n\r\nexport interface OAuthConfig {\r\n    loginUrl: string;\r\n    logoutUrl: string;\r\n    clientId: string;\r\n    logoutRedirectParameterName?: string;\r\n    scope?: string;\r\n    state?: string;\r\n    redirectUri?: string;\r\n    alwaysRequireLogin?: boolean;\r\n    autoTokenRenewal?: boolean;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthService {\r\n\r\n    public config: OAuthConfig;\r\n\r\n    private defaults: OAuthConfig;\r\n\r\n    public static get LOGIN_SUCCESS_EVENT(): string { return 'oauth:loginSuccess'; }\r\n    public static get INVALID_TOKEN_EVENT(): string { return 'oauth:invalidToken'; }\r\n\r\n    constructor(\r\n        private oAuthTokenService: OAuthTokenService,\r\n        private urlHashService: UrlHashService,\r\n        private localStorageService: LocalStorageService,\r\n        private eventAggregator: EventAggregator) {\r\n\r\n        this.defaults = {\r\n            loginUrl: null,\r\n            logoutUrl: null,\r\n            clientId: null,\r\n            logoutRedirectParameterName: 'post_logout_redirect_uri',\r\n            scope: null,\r\n            state: null,\r\n            alwaysRequireLogin: false,\r\n            autoTokenRenewal: true\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthConfig): OAuthConfig => {\r\n        if (this.config) {\r\n            throw new Error('OAuthProvider already configured.');\r\n        }\r\n\r\n        // Remove trailing slash from urls.\r\n        if (config.loginUrl.substr(-1) === '/') {\r\n            config.loginUrl = config.loginUrl.slice(0, -1);\r\n        }\r\n\r\n        if (config.logoutUrl.substr(-1) === '/') {\r\n            config.logoutUrl = config.logoutUrl.slice(0, -1);\r\n        }\r\n\r\n        // Extend default configuration.\r\n        this.config = objectAssign(this.defaults, config);\r\n\r\n        // Redirect is set to current location by default\r\n        const existingHash = window.location.hash;\r\n        let pathDefault = window.location.href;\r\n\r\n        // Remove not needed parts from urls.\r\n        if (existingHash) {\r\n            pathDefault = pathDefault.replace(existingHash, '');\r\n        }\r\n\r\n        if (pathDefault.substr(-1) === '#') {\r\n            pathDefault = pathDefault.slice(0, -1);\r\n        }\r\n\r\n        this.config.redirectUri = config.redirectUri || pathDefault;\r\n\r\n        return config;\r\n    };\r\n\r\n    public isAuthenticated = (): boolean => {\r\n        return <any>this.oAuthTokenService.getToken();\r\n    };\r\n\r\n    public login = (): void => {\r\n        window.location.href = this.getRedirectUrl();\r\n    };\r\n\r\n    public logout = (): void => {\r\n        const redirectUrl = `${this.config.logoutUrl}?` +\r\n            `${this.config.logoutRedirectParameterName}=${encodeURIComponent(this.config.redirectUri)}`;\r\n\r\n        window.location.href = redirectUrl;\r\n        this.oAuthTokenService.removeToken();\r\n    };\r\n\r\n    public loginOnStateChange = (toState): boolean => {\r\n        if (toState && this.isLoginRequired(toState) && !this.isAuthenticated() && !this.getTokenDataFromUrl()) {\r\n\r\n            if (this.localStorageService.isStorageSupported()) {\r\n                let url = window.location.href;\r\n\r\n                if (!window.location.hash) {\r\n                    url = this.getBaseRouteUrl();\r\n                }\r\n\r\n                this.localStorageService.set<string>(OAUTH_STARTPAGE_STORAGE_KEY, url);\r\n            }\r\n\r\n            this.login();\r\n\r\n            return true;\r\n        }\r\n\r\n        return false;\r\n    };\r\n\r\n    public setTokenOnRedirect = (): void => {\r\n        const tokenData = this.getTokenDataFromUrl();\r\n\r\n        if (!this.isAuthenticated() && tokenData) {\r\n            this.oAuthTokenService.setToken(tokenData);\r\n\r\n            if (this.localStorageService.isStorageSupported() && this.localStorageService.get(OAUTH_STARTPAGE_STORAGE_KEY)) {\r\n                const startPage = this.localStorageService.get<string>(OAUTH_STARTPAGE_STORAGE_KEY);\r\n\r\n                this.localStorageService.remove(OAUTH_STARTPAGE_STORAGE_KEY);\r\n                window.location.href = startPage;\r\n            } else {\r\n                // Redirect to the base application route\r\n                window.location.href = this.getBaseRouteUrl();\r\n            }\r\n\r\n            this.eventAggregator.publish(OAuthService.LOGIN_SUCCESS_EVENT, tokenData);\r\n\r\n            if (this.config.autoTokenRenewal) {\r\n                this.setAutomaticTokenRenewal();\r\n            }\r\n        }\r\n    };\r\n\r\n    private isLoginRequired = (state): boolean => {\r\n        const routeHasConfig = state.settings && state.settings.requireLogin !== undefined;\r\n        const routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false;\r\n\r\n        return routeHasConfig ? routeRequiresLogin : this.config.alwaysRequireLogin;\r\n    };\r\n\r\n    private getTokenDataFromUrl = (hash?: string): OAuthTokenData => {\r\n        const hashData = this.urlHashService.getHashData(hash);\r\n        const tokenData = this.oAuthTokenService.createToken(hashData);\r\n\r\n        return tokenData;\r\n    };\r\n\r\n    private getBaseRouteUrl = (): string => {\r\n        return window.location.origin + '/#/';\r\n    }\r\n\r\n    private getSimpleNonceValue = (): string => {\r\n        return ((Date.now() + Math.random()) * Math.random()).toString().replace('.', '');\r\n    }\r\n\r\n    private getRedirectUrl() {\r\n        let redirectUrl = `${this.config.loginUrl}?` +\r\n            `response_type=${this.oAuthTokenService.config.name}&` +\r\n            `client_id=${encodeURIComponent(this.config.clientId)}&` +\r\n            `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` +\r\n            `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`;\r\n\r\n        if (this.config.scope) {\r\n            redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`;\r\n        }\r\n\r\n        if (this.config.state) {\r\n            redirectUrl += `&state=${encodeURIComponent(this.config.state)}`;\r\n        }\r\n\r\n        return redirectUrl;\r\n    }\r\n\r\n    private setAutomaticTokenRenewal() {\r\n        const tokenExpirationTime = this.oAuthTokenService.getTokenExpirationTime() * 1000;\r\n\r\n        setTimeout(() => {\r\n            const iFrame = document.createElement('iframe');\r\n            iFrame.src = this.getRedirectUrl();\r\n            iFrame.style.display = 'none';\r\n            iFrame.onload = (event) => {\r\n                try {\r\n                    const hashWithNewToken = iFrame.contentWindow.location.hash;\r\n                    document.body.removeChild(iFrame);\r\n\r\n                    const tokenData = this.getTokenDataFromUrl(hashWithNewToken);\r\n\r\n                    if (tokenData) {\r\n                        this.oAuthTokenService.setToken(tokenData);\r\n                        this.setAutomaticTokenRenewal();\r\n                    }\r\n                } catch (ex) {\r\n                    // iFrame.contentWindow can fail when an iframe loads identity server login page\r\n                    // but this page will not redirect back to the app url waiting for the user to login in\r\n                    // this behaviour my occur i.e. when login page authentication cookies expire\r\n                    document.body.removeChild(iFrame);\r\n                }\r\n            };\r\n\r\n            document.body.appendChild(iFrame);\r\n        }, tokenExpirationTime);\r\n    }\r\n}"]} diff --git a/dist/amd/oauth-token-service.js b/dist/amd/oauth-token-service.js index f69152a..fff351e 100644 --- a/dist/amd/oauth-token-service.js +++ b/dist/amd/oauth-token-service.js @@ -55,6 +55,11 @@ define(["require", "exports", "aurelia-dependency-injection", "./jwt-token-servi this.getTokenType = function () { return _this.getToken() ? _this.getToken().tokenType : undefined; }; + this.getTokenExpirationTime = function () { + var tokenRenewalOffsetSeconds = 30; + var expireOffset = _this.config.expireOffsetSeconds + tokenRenewalOffsetSeconds; + return (_this.tokenData.expiresAt - _this.getTimeNow() - expireOffset); + }; this.removeToken = function () { return _this.tokenData = null; }; @@ -77,7 +82,7 @@ define(["require", "exports", "aurelia-dependency-injection", "./jwt-token-servi idToken: 'id_token', tokenType: 'token_type' }, - expireOffsetSeconds: 120 + expireOffsetSeconds: 60 }; } return OAuthTokenService; @@ -89,4 +94,4 @@ define(["require", "exports", "aurelia-dependency-injection", "./jwt-token-servi exports.OAuthTokenService = OAuthTokenService; }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-token-service.ts"],"names":[],"mappings":"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","file":"oauth-token-service.js","sourcesContent":["import { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport JwtTokenService, { JwtClaims } from './jwt-token-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nexport interface OAuthTokenConfig {\r\n    name: string;\r\n    urlTokenParameters?: {\r\n        idToken: string;\r\n        tokenType?: string;\r\n    };\r\n    expireOffsetSeconds?: number;\r\n}\r\n\r\nexport interface OAuthTokenData {\r\n    token: string;\r\n    tokenType: string;\r\n    expiresAt: number;\r\n    jwtClaims?: JwtClaims;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthTokenService {\r\n\r\n    public config: OAuthTokenConfig;\r\n\r\n    private tokenData: OAuthTokenData;\r\n\r\n    constructor(private jwtTokenService: JwtTokenService) {\r\n        this.config = {\r\n            name: 'id_token',\r\n            urlTokenParameters: {\r\n                idToken: 'id_token',\r\n                tokenType: 'token_type'\r\n            },\r\n            expireOffsetSeconds: 120\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthTokenConfig): OAuthTokenConfig => {\r\n\r\n        // Extend default configration with supplied config data\r\n        if (config.urlTokenParameters) {\r\n            config.urlTokenParameters = objectAssign(this.config.urlTokenParameters, config.urlTokenParameters);\r\n        }\r\n\r\n        this.config = objectAssign(this.config, config);\r\n\r\n        return config;\r\n    };\r\n\r\n    public createToken = (urlTokenData: any): OAuthTokenData => {\r\n        const token = urlTokenData[this.config.urlTokenParameters.idToken];\r\n        const tokenType = urlTokenData[this.config.urlTokenParameters.tokenType] || 'Bearer';\r\n\r\n        if (!token) {\r\n            return null;\r\n        }\r\n\r\n        const claims: JwtClaims = this.jwtTokenService.getJwtClaims(token);\r\n        const issuedTime = claims.nbf ? claims.nbf : claims.iat;\r\n        const expirationTime = claims.exp - issuedTime;\r\n\r\n        return {\r\n            token: token,\r\n            tokenType: tokenType,\r\n            expiresAt: this.getTimeNow() + expirationTime,\r\n            jwtClaims: claims\r\n        };\r\n    };\r\n\r\n    public setToken = (data: OAuthTokenData): OAuthTokenData => {\r\n        return this.tokenData = data;\r\n    };\r\n\r\n    public getToken = (): OAuthTokenData => {\r\n        return this.tokenData;\r\n    };\r\n\r\n    public getIdToken = (): string => {\r\n        return this.getToken() ? this.getToken().token : undefined;\r\n    };\r\n\r\n    public getAuthorizationHeader = (): string => {\r\n        if (!(this.getTokenType() && this.getIdToken())) {\r\n            return '';\r\n        }\r\n\r\n        const tokenType = this.getTokenType().charAt(0).toUpperCase() + this.getTokenType().substr(1);\r\n\r\n        return `${tokenType} ${this.getIdToken()}`;\r\n    };\r\n\r\n    public getTokenType = (): string => {\r\n        return this.getToken() ? this.getToken().tokenType : undefined;\r\n    };\r\n\r\n    public removeToken = (): OAuthTokenData => {\r\n        return this.tokenData = null;\r\n    };\r\n\r\n    public isTokenValid = (): boolean => {\r\n        const token = this.getToken();\r\n\r\n        if (!token) {\r\n            return false;\r\n        }\r\n\r\n        const timeNow = this.getTimeNow();\r\n        const expiresAt = token.expiresAt;\r\n        const isValid = (expiresAt && (expiresAt > timeNow + this.config.expireOffsetSeconds));\r\n\r\n        return isValid;\r\n    };\r\n\r\n    private getTimeNow = (): number => {\r\n        return Math.round(new Date().getTime() / 1000.0);\r\n    };\r\n}"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-token-service.ts"],"names":[],"mappings":"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","file":"oauth-token-service.js","sourcesContent":["import { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport JwtTokenService, { JwtClaims } from './jwt-token-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nexport interface OAuthTokenConfig {\r\n    name: string;\r\n    urlTokenParameters?: {\r\n        idToken: string;\r\n        tokenType?: string;\r\n    };\r\n    expireOffsetSeconds?: number;\r\n}\r\n\r\nexport interface OAuthTokenData {\r\n    token: string;\r\n    tokenType: string;\r\n    expiresAt: number;\r\n    jwtClaims?: JwtClaims;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthTokenService {\r\n\r\n    public config: OAuthTokenConfig;\r\n\r\n    private tokenData: OAuthTokenData;\r\n\r\n    constructor(private jwtTokenService: JwtTokenService) {\r\n        this.config = {\r\n            name: 'id_token',\r\n            urlTokenParameters: {\r\n                idToken: 'id_token',\r\n                tokenType: 'token_type'\r\n            },\r\n            expireOffsetSeconds: 60\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthTokenConfig): OAuthTokenConfig => {\r\n\r\n        // Extend default configration with supplied config data\r\n        if (config.urlTokenParameters) {\r\n            config.urlTokenParameters = objectAssign(this.config.urlTokenParameters, config.urlTokenParameters);\r\n        }\r\n\r\n        this.config = objectAssign(this.config, config);\r\n\r\n        return config;\r\n    };\r\n\r\n    public createToken = (urlTokenData: any): OAuthTokenData => {\r\n        const token = urlTokenData[this.config.urlTokenParameters.idToken];\r\n        const tokenType = urlTokenData[this.config.urlTokenParameters.tokenType] || 'Bearer';\r\n\r\n        if (!token) {\r\n            return null;\r\n        }\r\n\r\n        const claims: JwtClaims = this.jwtTokenService.getJwtClaims(token);\r\n        const issuedTime = claims.nbf ? claims.nbf : claims.iat;\r\n        const expirationTime = claims.exp - issuedTime;\r\n\r\n        return {\r\n            token: token,\r\n            tokenType: tokenType,\r\n            expiresAt: this.getTimeNow() + expirationTime,\r\n            jwtClaims: claims\r\n        };\r\n    };\r\n\r\n    public setToken = (data: OAuthTokenData): OAuthTokenData => {\r\n        return this.tokenData = data;\r\n    };\r\n\r\n    public getToken = (): OAuthTokenData => {\r\n        return this.tokenData;\r\n    };\r\n\r\n    public getIdToken = (): string => {\r\n        return this.getToken() ? this.getToken().token : undefined;\r\n    };\r\n\r\n    public getAuthorizationHeader = (): string => {\r\n        if (!(this.getTokenType() && this.getIdToken())) {\r\n            return '';\r\n        }\r\n\r\n        const tokenType = this.getTokenType().charAt(0).toUpperCase() + this.getTokenType().substr(1);\r\n\r\n        return `${tokenType} ${this.getIdToken()}`;\r\n    };\r\n\r\n    public getTokenType = (): string => {\r\n        return this.getToken() ? this.getToken().tokenType : undefined;\r\n    };\r\n\r\n    public getTokenExpirationTime = (): number => {\r\n        const tokenRenewalOffsetSeconds = 30;\r\n        const expireOffset = this.config.expireOffsetSeconds + tokenRenewalOffsetSeconds;\r\n\r\n        return (this.tokenData.expiresAt - this.getTimeNow() - expireOffset);\r\n    };\r\n\r\n    public removeToken = (): OAuthTokenData => {\r\n        return this.tokenData = null;\r\n    };\r\n\r\n    public isTokenValid = (): boolean => {\r\n        const token = this.getToken();\r\n\r\n        if (!token) {\r\n            return false;\r\n        }\r\n\r\n        const timeNow = this.getTimeNow();\r\n        const expiresAt = token.expiresAt;\r\n        const isValid = (expiresAt && (expiresAt > timeNow + this.config.expireOffsetSeconds));\r\n\r\n        return isValid;\r\n    };\r\n\r\n    private getTimeNow = (): number => {\r\n        return Math.round(new Date().getTime() / 1000.0);\r\n    };\r\n}"]} diff --git a/dist/amd/url-hash-service.js b/dist/amd/url-hash-service.js index 61d07f0..ee27776 100644 --- a/dist/amd/url-hash-service.js +++ b/dist/amd/url-hash-service.js @@ -3,8 +3,8 @@ define(["require", "exports"], function (require, exports) { var UrlHashService = (function () { function UrlHashService() { var _this = this; - this.getHash = function () { - var hash = window.location.hash; + this.getHash = function (hashValue) { + var hash = hashValue ? hashValue : window.location.hash; if (hash.indexOf('#/') > -1) { hash = hash.substring(hash.indexOf('#/') + 2); } @@ -13,8 +13,8 @@ define(["require", "exports"], function (require, exports) { } return hash; }; - this.getHashData = function () { - var hash = _this.getHash(); + this.getHashData = function (hashValue) { + var hash = _this.getHash(hashValue); var searchRegex = /([^&=]+)=?([^&]*)/g; var hashData = {}; var match = searchRegex.exec(hash); @@ -39,4 +39,4 @@ define(["require", "exports"], function (require, exports) { exports.default = UrlHashService; }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy91cmwtaGFzaC1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0lBQUE7UUFBQTtZQUFBLGlCQXFDQztZQXBDVSxZQUFPLEdBQUc7Z0JBQ2IsSUFBSSxJQUFJLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUM7Z0JBRWhDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUMxQixJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNsRCxDQUFDO2dCQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDaEMsSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQzdCLENBQUM7Z0JBRUQsTUFBTSxDQUFDLElBQUksQ0FBQztZQUNoQixDQUFDLENBQUM7WUFFSyxnQkFBVyxHQUFHO2dCQUNqQixJQUFNLElBQUksR0FBRyxLQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQzVCLElBQU0sV0FBVyxHQUFHLG9CQUFvQixDQUFDO2dCQUN6QyxJQUFNLFFBQVEsR0FBRyxFQUFFLENBQUM7Z0JBRXBCLElBQUksS0FBSyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ25DLE9BQU8sS0FBSyxFQUFFLENBQUM7b0JBQ1gsSUFBTSxTQUFTLEdBQUcsS0FBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDL0MsSUFBTSxLQUFLLEdBQUcsS0FBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFFM0MsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEtBQUssQ0FBQztvQkFDNUIsS0FBSyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ25DLENBQUM7Z0JBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQztZQUNwQixDQUFDLENBQUM7WUFFSyxjQUFTLEdBQUc7Z0JBQ2YsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDO1lBQzlCLENBQUMsQ0FBQztZQUVNLGtCQUFhLEdBQUcsVUFBQyxDQUFTO2dCQUM5QixNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztZQUNyRCxDQUFDLENBQUM7UUFDTixDQUFDO1FBQUQscUJBQUM7SUFBRCxDQXJDQSxBQXFDQyxJQUFBIiwiZmlsZSI6InVybC1oYXNoLXNlcnZpY2UuanMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZGVmYXVsdCBjbGFzcyBVcmxIYXNoU2VydmljZSB7XHJcbiAgICBwdWJsaWMgZ2V0SGFzaCA9ICgpOiBzdHJpbmcgPT4ge1xyXG4gICAgICAgIGxldCBoYXNoID0gd2luZG93LmxvY2F0aW9uLmhhc2g7XHJcblxyXG4gICAgICAgIGlmIChoYXNoLmluZGV4T2YoJyMvJykgPiAtMSkge1xyXG4gICAgICAgICAgICBoYXNoID0gaGFzaC5zdWJzdHJpbmcoaGFzaC5pbmRleE9mKCcjLycpICsgMik7XHJcbiAgICAgICAgfSBlbHNlIGlmIChoYXNoLmluZGV4T2YoJyMnKSA+IC0xKSB7XHJcbiAgICAgICAgICAgIGhhc2ggPSBoYXNoLnN1YnN0cmluZygxKTtcclxuICAgICAgICB9XHJcblxyXG4gICAgICAgIHJldHVybiBoYXNoO1xyXG4gICAgfTtcclxuXHJcbiAgICBwdWJsaWMgZ2V0SGFzaERhdGEgPSAoKTogYW55ID0+IHtcclxuICAgICAgICBjb25zdCBoYXNoID0gdGhpcy5nZXRIYXNoKCk7XHJcbiAgICAgICAgY29uc3Qgc2VhcmNoUmVnZXggPSAvKFteJj1dKyk9PyhbXiZdKikvZztcclxuICAgICAgICBjb25zdCBoYXNoRGF0YSA9IHt9O1xyXG5cclxuICAgICAgICBsZXQgbWF0Y2ggPSBzZWFyY2hSZWdleC5leGVjKGhhc2gpO1xyXG4gICAgICAgIHdoaWxlIChtYXRjaCkge1xyXG4gICAgICAgICAgICBjb25zdCBwYXJhbWV0ZXIgPSB0aGlzLmRlY29kZVVybERhdGEobWF0Y2hbMV0pO1xyXG4gICAgICAgICAgICBjb25zdCB2YWx1ZSA9IHRoaXMuZGVjb2RlVXJsRGF0YShtYXRjaFsyXSk7XHJcblxyXG4gICAgICAgICAgICBoYXNoRGF0YVtwYXJhbWV0ZXJdID0gdmFsdWU7XHJcbiAgICAgICAgICAgIG1hdGNoID0gc2VhcmNoUmVnZXguZXhlYyhoYXNoKTtcclxuICAgICAgICB9XHJcblxyXG4gICAgICAgIHJldHVybiBoYXNoRGF0YTtcclxuICAgIH07XHJcblxyXG4gICAgcHVibGljIGNsZWFySGFzaCA9ICgpOiB2b2lkID0+IHtcclxuICAgICAgICB3aW5kb3cubG9jYXRpb24uaGFzaCA9ICcnO1xyXG4gICAgfTtcclxuXHJcbiAgICBwcml2YXRlIGRlY29kZVVybERhdGEgPSAoczogc3RyaW5nKTogc3RyaW5nID0+IHtcclxuICAgICAgICByZXR1cm4gZGVjb2RlVVJJQ29tcG9uZW50KHMucmVwbGFjZSgvXFwrL2csICcgJykpO1xyXG4gICAgfTtcclxufSJdfQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy91cmwtaGFzaC1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0lBQUE7UUFBQTtZQUFBLGlCQXFDQztZQXBDVSxZQUFPLEdBQUcsVUFBQyxTQUFrQjtnQkFDaEMsSUFBSSxJQUFJLEdBQUcsU0FBUyxHQUFHLFNBQVMsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQztnQkFFeEQsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQzFCLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ2xELENBQUM7Z0JBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNoQyxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDN0IsQ0FBQztnQkFFRCxNQUFNLENBQUMsSUFBSSxDQUFDO1lBQ2hCLENBQUMsQ0FBQztZQUVLLGdCQUFXLEdBQUcsVUFBQyxTQUFrQjtnQkFDcEMsSUFBTSxJQUFJLEdBQUcsS0FBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFDckMsSUFBTSxXQUFXLEdBQUcsb0JBQW9CLENBQUM7Z0JBQ3pDLElBQU0sUUFBUSxHQUFHLEVBQUUsQ0FBQztnQkFFcEIsSUFBSSxLQUFLLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDbkMsT0FBTyxLQUFLLEVBQUUsQ0FBQztvQkFDWCxJQUFNLFNBQVMsR0FBRyxLQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUMvQyxJQUFNLEtBQUssR0FBRyxLQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUUzQyxRQUFRLENBQUMsU0FBUyxDQUFDLEdBQUcsS0FBSyxDQUFDO29CQUM1QixLQUFLLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDbkMsQ0FBQztnQkFFRCxNQUFNLENBQUMsUUFBUSxDQUFDO1lBQ3BCLENBQUMsQ0FBQztZQUVLLGNBQVMsR0FBRztnQkFDZixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDOUIsQ0FBQyxDQUFDO1lBRU0sa0JBQWEsR0FBRyxVQUFDLENBQVM7Z0JBQzlCLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ3JELENBQUMsQ0FBQztRQUNOLENBQUM7UUFBRCxxQkFBQztJQUFELENBckNBLEFBcUNDLElBQUEiLCJmaWxlIjoidXJsLWhhc2gtc2VydmljZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBkZWZhdWx0IGNsYXNzIFVybEhhc2hTZXJ2aWNlIHtcclxuICAgIHB1YmxpYyBnZXRIYXNoID0gKGhhc2hWYWx1ZT86IHN0cmluZyk6IHN0cmluZyA9PiB7XHJcbiAgICAgICAgbGV0IGhhc2ggPSBoYXNoVmFsdWUgPyBoYXNoVmFsdWUgOiB3aW5kb3cubG9jYXRpb24uaGFzaDtcclxuXHJcbiAgICAgICAgaWYgKGhhc2guaW5kZXhPZignIy8nKSA+IC0xKSB7XHJcbiAgICAgICAgICAgIGhhc2ggPSBoYXNoLnN1YnN0cmluZyhoYXNoLmluZGV4T2YoJyMvJykgKyAyKTtcclxuICAgICAgICB9IGVsc2UgaWYgKGhhc2guaW5kZXhPZignIycpID4gLTEpIHtcclxuICAgICAgICAgICAgaGFzaCA9IGhhc2guc3Vic3RyaW5nKDEpO1xyXG4gICAgICAgIH1cclxuXHJcbiAgICAgICAgcmV0dXJuIGhhc2g7XHJcbiAgICB9O1xyXG5cclxuICAgIHB1YmxpYyBnZXRIYXNoRGF0YSA9IChoYXNoVmFsdWU/OiBzdHJpbmcpOiBhbnkgPT4ge1xyXG4gICAgICAgIGNvbnN0IGhhc2ggPSB0aGlzLmdldEhhc2goaGFzaFZhbHVlKTtcclxuICAgICAgICBjb25zdCBzZWFyY2hSZWdleCA9IC8oW14mPV0rKT0/KFteJl0qKS9nO1xyXG4gICAgICAgIGNvbnN0IGhhc2hEYXRhID0ge307XHJcblxyXG4gICAgICAgIGxldCBtYXRjaCA9IHNlYXJjaFJlZ2V4LmV4ZWMoaGFzaCk7XHJcbiAgICAgICAgd2hpbGUgKG1hdGNoKSB7XHJcbiAgICAgICAgICAgIGNvbnN0IHBhcmFtZXRlciA9IHRoaXMuZGVjb2RlVXJsRGF0YShtYXRjaFsxXSk7XHJcbiAgICAgICAgICAgIGNvbnN0IHZhbHVlID0gdGhpcy5kZWNvZGVVcmxEYXRhKG1hdGNoWzJdKTtcclxuXHJcbiAgICAgICAgICAgIGhhc2hEYXRhW3BhcmFtZXRlcl0gPSB2YWx1ZTtcclxuICAgICAgICAgICAgbWF0Y2ggPSBzZWFyY2hSZWdleC5leGVjKGhhc2gpO1xyXG4gICAgICAgIH1cclxuXHJcbiAgICAgICAgcmV0dXJuIGhhc2hEYXRhO1xyXG4gICAgfTtcclxuXHJcbiAgICBwdWJsaWMgY2xlYXJIYXNoID0gKCk6IHZvaWQgPT4ge1xyXG4gICAgICAgIHdpbmRvdy5sb2NhdGlvbi5oYXNoID0gJyc7XHJcbiAgICB9O1xyXG5cclxuICAgIHByaXZhdGUgZGVjb2RlVXJsRGF0YSA9IChzOiBzdHJpbmcpOiBzdHJpbmcgPT4ge1xyXG4gICAgICAgIHJldHVybiBkZWNvZGVVUklDb21wb25lbnQocy5yZXBsYWNlKC9cXCsvZywgJyAnKSk7XHJcbiAgICB9O1xyXG59Il19 diff --git a/dist/commonjs/oauth-service.js b/dist/commonjs/oauth-service.js index 7abd35a..ccfb4ea 100644 --- a/dist/commonjs/oauth-service.js +++ b/dist/commonjs/oauth-service.js @@ -48,18 +48,7 @@ var OAuthService = OAuthService_1 = (function () { return _this.oAuthTokenService.getToken(); }; this.login = function () { - var redirectUrl = _this.config.loginUrl + "?" + - ("response_type=" + _this.oAuthTokenService.config.name + "&") + - ("client_id=" + encodeURIComponent(_this.config.clientId) + "&") + - ("redirect_uri=" + encodeURIComponent(_this.config.redirectUri) + "&") + - ("nonce=" + encodeURIComponent(_this.getSimpleNonceValue())); - if (_this.config.scope) { - redirectUrl += "&scope=" + encodeURIComponent(_this.config.scope); - } - if (_this.config.state) { - redirectUrl += "&state=" + encodeURIComponent(_this.config.state); - } - window.location.href = redirectUrl; + window.location.href = _this.getRedirectUrl(); }; this.logout = function () { var redirectUrl = _this.config.logoutUrl + "?" + @@ -94,6 +83,9 @@ var OAuthService = OAuthService_1 = (function () { window.location.href = _this.getBaseRouteUrl(); } _this.eventAggregator.publish(OAuthService_1.LOGIN_SUCCESS_EVENT, tokenData); + if (_this.config.autoTokenRenewal) { + _this.setAutomaticTokenRenewal(); + } } }; this.isLoginRequired = function (state) { @@ -101,8 +93,8 @@ var OAuthService = OAuthService_1 = (function () { var routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false; return routeHasConfig ? routeRequiresLogin : _this.config.alwaysRequireLogin; }; - this.getTokenDataFromUrl = function () { - var hashData = _this.urlHashService.getHashData(); + this.getTokenDataFromUrl = function (hash) { + var hashData = _this.urlHashService.getHashData(hash); var tokenData = _this.oAuthTokenService.createToken(hashData); return tokenData; }; @@ -119,7 +111,8 @@ var OAuthService = OAuthService_1 = (function () { logoutRedirectParameterName: 'post_logout_redirect_uri', scope: null, state: null, - alwaysRequireLogin: false + alwaysRequireLogin: false, + autoTokenRenewal: true }; } Object.defineProperty(OAuthService, "LOGIN_SUCCESS_EVENT", { @@ -132,6 +125,44 @@ var OAuthService = OAuthService_1 = (function () { enumerable: true, configurable: true }); + OAuthService.prototype.getRedirectUrl = function () { + var redirectUrl = this.config.loginUrl + "?" + + ("response_type=" + this.oAuthTokenService.config.name + "&") + + ("client_id=" + encodeURIComponent(this.config.clientId) + "&") + + ("redirect_uri=" + encodeURIComponent(this.config.redirectUri) + "&") + + ("nonce=" + encodeURIComponent(this.getSimpleNonceValue())); + if (this.config.scope) { + redirectUrl += "&scope=" + encodeURIComponent(this.config.scope); + } + if (this.config.state) { + redirectUrl += "&state=" + encodeURIComponent(this.config.state); + } + return redirectUrl; + }; + OAuthService.prototype.setAutomaticTokenRenewal = function () { + var _this = this; + var tokenExpirationTime = this.oAuthTokenService.getTokenExpirationTime() * 1000; + setTimeout(function () { + var iFrame = document.createElement('iframe'); + iFrame.src = _this.getRedirectUrl(); + iFrame.style.display = 'none'; + iFrame.onload = function (event) { + try { + var hashWithNewToken = iFrame.contentWindow.location.hash; + document.body.removeChild(iFrame); + var tokenData = _this.getTokenDataFromUrl(hashWithNewToken); + if (tokenData) { + _this.oAuthTokenService.setToken(tokenData); + _this.setAutomaticTokenRenewal(); + } + } + catch (ex) { + document.body.removeChild(iFrame); + } + }; + document.body.appendChild(iFrame); + }, tokenExpirationTime); + }; return OAuthService; }()); OAuthService = OAuthService_1 = __decorate([ @@ -144,4 +175,4 @@ OAuthService = OAuthService_1 = __decorate([ exports.OAuthService = OAuthService; var OAuthService_1; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-service.ts"],"names":[],"mappings":"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","file":"oauth-service.js","sourcesContent":["import { EventAggregator } from 'aurelia-event-aggregator';\r\nimport { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport { OAuthTokenService, OAuthTokenData } from './oauth-token-service';\r\nimport UrlHashService from './url-hash-service';\r\nimport LocalStorageService from './local-storage-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nconst OAUTH_STARTPAGE_STORAGE_KEY: string = 'oauth.startPage';\r\n\r\nexport interface OAuthConfig {\r\n    loginUrl: string;\r\n    logoutUrl: string;\r\n    clientId: string;\r\n    logoutRedirectParameterName?: string;\r\n    scope?: string;\r\n    state?: string;\r\n    redirectUri?: string;\r\n    alwaysRequireLogin?: boolean;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthService {\r\n\r\n    public config: OAuthConfig;\r\n\r\n    private defaults: OAuthConfig;\r\n\r\n    public static get LOGIN_SUCCESS_EVENT(): string { return 'oauth:loginSuccess'; }\r\n    public static get INVALID_TOKEN_EVENT(): string { return 'oauth:invalidToken'; }\r\n\r\n    constructor(\r\n        private oAuthTokenService: OAuthTokenService,\r\n        private urlHashService: UrlHashService,\r\n        private localStorageService: LocalStorageService,\r\n        private eventAggregator: EventAggregator) {\r\n\r\n        this.defaults = {\r\n            loginUrl: null,\r\n            logoutUrl: null,\r\n            clientId: null,\r\n            logoutRedirectParameterName: 'post_logout_redirect_uri',\r\n            scope: null,\r\n            state: null,\r\n            alwaysRequireLogin: false\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthConfig): OAuthConfig => {\r\n        if (this.config) {\r\n            throw new Error('OAuthProvider already configured.');\r\n        }\r\n\r\n        // Remove trailing slash from urls.\r\n        if (config.loginUrl.substr(-1) === '/') {\r\n            config.loginUrl = config.loginUrl.slice(0, -1);\r\n        }\r\n\r\n        if (config.logoutUrl.substr(-1) === '/') {\r\n            config.logoutUrl = config.logoutUrl.slice(0, -1);\r\n        }\r\n\r\n        // Extend default configuration.\r\n        this.config = objectAssign(this.defaults, config);\r\n\r\n        // Redirect is set to current location by default\r\n        const existingHash = window.location.hash;\r\n        let pathDefault = window.location.href;\r\n\r\n        // Remove not needed parts from urls.\r\n        if (existingHash) {\r\n            pathDefault = pathDefault.replace(existingHash, '');\r\n        }\r\n\r\n        if (pathDefault.substr(-1) === '#') {\r\n            pathDefault = pathDefault.slice(0, -1);\r\n        }\r\n\r\n        this.config.redirectUri = config.redirectUri || pathDefault;\r\n\r\n        return config;\r\n    };\r\n\r\n    public isAuthenticated = (): boolean => {\r\n        return <any>this.oAuthTokenService.getToken();\r\n    };\r\n\r\n    public login = (): void => {\r\n        let redirectUrl = `${this.config.loginUrl}?` +\r\n            `response_type=${this.oAuthTokenService.config.name}&` +\r\n            `client_id=${encodeURIComponent(this.config.clientId)}&` +\r\n            `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` +\r\n            `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`;\r\n\r\n        if (this.config.scope) {\r\n            redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`;\r\n        }\r\n\r\n        if (this.config.state) {\r\n            redirectUrl += `&state=${encodeURIComponent(this.config.state)}`;\r\n        }\r\n\r\n        window.location.href = redirectUrl;\r\n    };\r\n\r\n    public logout = (): void => {\r\n        const redirectUrl = `${this.config.logoutUrl}?` +\r\n            `${this.config.logoutRedirectParameterName}=${encodeURIComponent(this.config.redirectUri)}`;\r\n\r\n        window.location.href = redirectUrl;\r\n        this.oAuthTokenService.removeToken();\r\n    };\r\n\r\n    public loginOnStateChange = (toState): boolean => {\r\n        if (toState && this.isLoginRequired(toState) && !this.isAuthenticated() && !this.getTokenDataFromUrl()) {\r\n\r\n            if (this.localStorageService.isStorageSupported()) {\r\n                let url = window.location.href;\r\n\r\n                if (!window.location.hash) {\r\n                    url = this.getBaseRouteUrl();\r\n                }\r\n\r\n                this.localStorageService.set<string>(OAUTH_STARTPAGE_STORAGE_KEY, url);\r\n            }\r\n\r\n            this.login();\r\n\r\n            return true;\r\n        }\r\n\r\n        return false;\r\n    };\r\n\r\n    public setTokenOnRedirect = (): void => {\r\n        const tokenData = this.getTokenDataFromUrl();\r\n\r\n        if (!this.isAuthenticated() && tokenData) {\r\n            this.oAuthTokenService.setToken(tokenData);\r\n\r\n            if (this.localStorageService.isStorageSupported() && this.localStorageService.get(OAUTH_STARTPAGE_STORAGE_KEY)) {\r\n                const startPage = this.localStorageService.get<string>(OAUTH_STARTPAGE_STORAGE_KEY);\r\n\r\n                this.localStorageService.remove(OAUTH_STARTPAGE_STORAGE_KEY);\r\n                window.location.href = startPage;\r\n            } else {\r\n                // Redirect to the base application route\r\n                window.location.href = this.getBaseRouteUrl();\r\n            }\r\n\r\n            this.eventAggregator.publish(OAuthService.LOGIN_SUCCESS_EVENT, tokenData);\r\n        }\r\n    };\r\n\r\n    private isLoginRequired = (state): boolean => {\r\n        const routeHasConfig = state.settings && state.settings.requireLogin !== undefined;\r\n        const routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false;\r\n\r\n        return routeHasConfig ? routeRequiresLogin : this.config.alwaysRequireLogin;\r\n    };\r\n\r\n    private getTokenDataFromUrl = (): OAuthTokenData => {\r\n        const hashData = this.urlHashService.getHashData();\r\n        const tokenData = this.oAuthTokenService.createToken(hashData);\r\n\r\n        return tokenData;\r\n    };\r\n\r\n    private getBaseRouteUrl = (): string => {\r\n        return window.location.origin + '/#/';\r\n    }\r\n\r\n    private getSimpleNonceValue = (): string => {\r\n        return ((Date.now() + Math.random()) * Math.random()).toString().replace('.', '');\r\n    }\r\n}"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-service.ts"],"names":[],"mappings":"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","file":"oauth-service.js","sourcesContent":["import { EventAggregator } from 'aurelia-event-aggregator';\r\nimport { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport { OAuthTokenService, OAuthTokenData } from './oauth-token-service';\r\nimport UrlHashService from './url-hash-service';\r\nimport LocalStorageService from './local-storage-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nconst OAUTH_STARTPAGE_STORAGE_KEY: string = 'oauth.startPage';\r\n\r\nexport interface OAuthConfig {\r\n    loginUrl: string;\r\n    logoutUrl: string;\r\n    clientId: string;\r\n    logoutRedirectParameterName?: string;\r\n    scope?: string;\r\n    state?: string;\r\n    redirectUri?: string;\r\n    alwaysRequireLogin?: boolean;\r\n    autoTokenRenewal?: boolean;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthService {\r\n\r\n    public config: OAuthConfig;\r\n\r\n    private defaults: OAuthConfig;\r\n\r\n    public static get LOGIN_SUCCESS_EVENT(): string { return 'oauth:loginSuccess'; }\r\n    public static get INVALID_TOKEN_EVENT(): string { return 'oauth:invalidToken'; }\r\n\r\n    constructor(\r\n        private oAuthTokenService: OAuthTokenService,\r\n        private urlHashService: UrlHashService,\r\n        private localStorageService: LocalStorageService,\r\n        private eventAggregator: EventAggregator) {\r\n\r\n        this.defaults = {\r\n            loginUrl: null,\r\n            logoutUrl: null,\r\n            clientId: null,\r\n            logoutRedirectParameterName: 'post_logout_redirect_uri',\r\n            scope: null,\r\n            state: null,\r\n            alwaysRequireLogin: false,\r\n            autoTokenRenewal: true\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthConfig): OAuthConfig => {\r\n        if (this.config) {\r\n            throw new Error('OAuthProvider already configured.');\r\n        }\r\n\r\n        // Remove trailing slash from urls.\r\n        if (config.loginUrl.substr(-1) === '/') {\r\n            config.loginUrl = config.loginUrl.slice(0, -1);\r\n        }\r\n\r\n        if (config.logoutUrl.substr(-1) === '/') {\r\n            config.logoutUrl = config.logoutUrl.slice(0, -1);\r\n        }\r\n\r\n        // Extend default configuration.\r\n        this.config = objectAssign(this.defaults, config);\r\n\r\n        // Redirect is set to current location by default\r\n        const existingHash = window.location.hash;\r\n        let pathDefault = window.location.href;\r\n\r\n        // Remove not needed parts from urls.\r\n        if (existingHash) {\r\n            pathDefault = pathDefault.replace(existingHash, '');\r\n        }\r\n\r\n        if (pathDefault.substr(-1) === '#') {\r\n            pathDefault = pathDefault.slice(0, -1);\r\n        }\r\n\r\n        this.config.redirectUri = config.redirectUri || pathDefault;\r\n\r\n        return config;\r\n    };\r\n\r\n    public isAuthenticated = (): boolean => {\r\n        return <any>this.oAuthTokenService.getToken();\r\n    };\r\n\r\n    public login = (): void => {\r\n        window.location.href = this.getRedirectUrl();\r\n    };\r\n\r\n    public logout = (): void => {\r\n        const redirectUrl = `${this.config.logoutUrl}?` +\r\n            `${this.config.logoutRedirectParameterName}=${encodeURIComponent(this.config.redirectUri)}`;\r\n\r\n        window.location.href = redirectUrl;\r\n        this.oAuthTokenService.removeToken();\r\n    };\r\n\r\n    public loginOnStateChange = (toState): boolean => {\r\n        if (toState && this.isLoginRequired(toState) && !this.isAuthenticated() && !this.getTokenDataFromUrl()) {\r\n\r\n            if (this.localStorageService.isStorageSupported()) {\r\n                let url = window.location.href;\r\n\r\n                if (!window.location.hash) {\r\n                    url = this.getBaseRouteUrl();\r\n                }\r\n\r\n                this.localStorageService.set<string>(OAUTH_STARTPAGE_STORAGE_KEY, url);\r\n            }\r\n\r\n            this.login();\r\n\r\n            return true;\r\n        }\r\n\r\n        return false;\r\n    };\r\n\r\n    public setTokenOnRedirect = (): void => {\r\n        const tokenData = this.getTokenDataFromUrl();\r\n\r\n        if (!this.isAuthenticated() && tokenData) {\r\n            this.oAuthTokenService.setToken(tokenData);\r\n\r\n            if (this.localStorageService.isStorageSupported() && this.localStorageService.get(OAUTH_STARTPAGE_STORAGE_KEY)) {\r\n                const startPage = this.localStorageService.get<string>(OAUTH_STARTPAGE_STORAGE_KEY);\r\n\r\n                this.localStorageService.remove(OAUTH_STARTPAGE_STORAGE_KEY);\r\n                window.location.href = startPage;\r\n            } else {\r\n                // Redirect to the base application route\r\n                window.location.href = this.getBaseRouteUrl();\r\n            }\r\n\r\n            this.eventAggregator.publish(OAuthService.LOGIN_SUCCESS_EVENT, tokenData);\r\n\r\n            if (this.config.autoTokenRenewal) {\r\n                this.setAutomaticTokenRenewal();\r\n            }\r\n        }\r\n    };\r\n\r\n    private isLoginRequired = (state): boolean => {\r\n        const routeHasConfig = state.settings && state.settings.requireLogin !== undefined;\r\n        const routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false;\r\n\r\n        return routeHasConfig ? routeRequiresLogin : this.config.alwaysRequireLogin;\r\n    };\r\n\r\n    private getTokenDataFromUrl = (hash?: string): OAuthTokenData => {\r\n        const hashData = this.urlHashService.getHashData(hash);\r\n        const tokenData = this.oAuthTokenService.createToken(hashData);\r\n\r\n        return tokenData;\r\n    };\r\n\r\n    private getBaseRouteUrl = (): string => {\r\n        return window.location.origin + '/#/';\r\n    }\r\n\r\n    private getSimpleNonceValue = (): string => {\r\n        return ((Date.now() + Math.random()) * Math.random()).toString().replace('.', '');\r\n    }\r\n\r\n    private getRedirectUrl() {\r\n        let redirectUrl = `${this.config.loginUrl}?` +\r\n            `response_type=${this.oAuthTokenService.config.name}&` +\r\n            `client_id=${encodeURIComponent(this.config.clientId)}&` +\r\n            `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` +\r\n            `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`;\r\n\r\n        if (this.config.scope) {\r\n            redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`;\r\n        }\r\n\r\n        if (this.config.state) {\r\n            redirectUrl += `&state=${encodeURIComponent(this.config.state)}`;\r\n        }\r\n\r\n        return redirectUrl;\r\n    }\r\n\r\n    private setAutomaticTokenRenewal() {\r\n        const tokenExpirationTime = this.oAuthTokenService.getTokenExpirationTime() * 1000;\r\n\r\n        setTimeout(() => {\r\n            const iFrame = document.createElement('iframe');\r\n            iFrame.src = this.getRedirectUrl();\r\n            iFrame.style.display = 'none';\r\n            iFrame.onload = (event) => {\r\n                try {\r\n                    const hashWithNewToken = iFrame.contentWindow.location.hash;\r\n                    document.body.removeChild(iFrame);\r\n\r\n                    const tokenData = this.getTokenDataFromUrl(hashWithNewToken);\r\n\r\n                    if (tokenData) {\r\n                        this.oAuthTokenService.setToken(tokenData);\r\n                        this.setAutomaticTokenRenewal();\r\n                    }\r\n                } catch (ex) {\r\n                    // iFrame.contentWindow can fail when an iframe loads identity server login page\r\n                    // but this page will not redirect back to the app url waiting for the user to login in\r\n                    // this behaviour my occur i.e. when login page authentication cookies expire\r\n                    document.body.removeChild(iFrame);\r\n                }\r\n            };\r\n\r\n            document.body.appendChild(iFrame);\r\n        }, tokenExpirationTime);\r\n    }\r\n}"]} diff --git a/dist/commonjs/oauth-token-service.js b/dist/commonjs/oauth-token-service.js index 081f2e0..39799bd 100644 --- a/dist/commonjs/oauth-token-service.js +++ b/dist/commonjs/oauth-token-service.js @@ -57,6 +57,11 @@ var OAuthTokenService = (function () { this.getTokenType = function () { return _this.getToken() ? _this.getToken().tokenType : undefined; }; + this.getTokenExpirationTime = function () { + var tokenRenewalOffsetSeconds = 30; + var expireOffset = _this.config.expireOffsetSeconds + tokenRenewalOffsetSeconds; + return (_this.tokenData.expiresAt - _this.getTimeNow() - expireOffset); + }; this.removeToken = function () { return _this.tokenData = null; }; @@ -79,7 +84,7 @@ var OAuthTokenService = (function () { idToken: 'id_token', tokenType: 'token_type' }, - expireOffsetSeconds: 120 + expireOffsetSeconds: 60 }; } return OAuthTokenService; @@ -90,4 +95,4 @@ OAuthTokenService = __decorate([ ], OAuthTokenService); exports.OAuthTokenService = OAuthTokenService; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-token-service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,6EAA0D;AAE1D,yDAAiE;AACjE,qDAAiD;AAmBjD,IAAa,iBAAiB;IAM1B,2BAAoB,eAAgC;QAApD,iBASC;QATmB,oBAAe,GAAf,eAAe,CAAiB;QAW7C,cAAS,GAAG,UAAC,MAAwB;YAGxC,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBAC5B,MAAM,CAAC,kBAAkB,GAAG,8BAAY,CAAC,KAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC;YACxG,CAAC;YAED,KAAI,CAAC,MAAM,GAAG,8BAAY,CAAC,KAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAEhD,MAAM,CAAC,MAAM,CAAC;QAClB,CAAC,CAAC;QAEK,gBAAW,GAAG,UAAC,YAAiB;YACnC,IAAM,KAAK,GAAG,YAAY,CAAC,KAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACnE,IAAM,SAAS,GAAG,YAAY,CAAC,KAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC;YAErF,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACT,MAAM,CAAC,IAAI,CAAC;YAChB,CAAC;YAED,IAAM,MAAM,GAAc,KAAI,CAAC,eAAe,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACnE,IAAM,UAAU,GAAG,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;YACxD,IAAM,cAAc,GAAG,MAAM,CAAC,GAAG,GAAG,UAAU,CAAC;YAE/C,MAAM,CAAC;gBACH,KAAK,EAAE,KAAK;gBACZ,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,KAAI,CAAC,UAAU,EAAE,GAAG,cAAc;gBAC7C,SAAS,EAAE,MAAM;aACpB,CAAC;QACN,CAAC,CAAC;QAEK,aAAQ,GAAG,UAAC,IAAoB;YACnC,MAAM,CAAC,KAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACjC,CAAC,CAAC;QAEK,aAAQ,GAAG;YACd,MAAM,CAAC,KAAI,CAAC,SAAS,CAAC;QAC1B,CAAC,CAAC;QAEK,eAAU,GAAG;YAChB,MAAM,CAAC,KAAI,CAAC,QAAQ,EAAE,GAAG,KAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,GAAG,SAAS,CAAC;QAC/D,CAAC,CAAC;QAEK,2BAAsB,GAAG;YAC5B,EAAE,CAAC,CAAC,CAAC,CAAC,KAAI,CAAC,YAAY,EAAE,IAAI,KAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC9C,MAAM,CAAC,EAAE,CAAC;YACd,CAAC;YAED,IAAM,SAAS,GAAG,KAAI,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAI,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAE9F,MAAM,CAAI,SAAS,SAAI,KAAI,CAAC,UAAU,EAAI,CAAC;QAC/C,CAAC,CAAC;QAEK,iBAAY,GAAG;YAClB,MAAM,CAAC,KAAI,CAAC,QAAQ,EAAE,GAAG,KAAI,CAAC,QAAQ,EAAE,CAAC,SAAS,GAAG,SAAS,CAAC;QACnE,CAAC,CAAC;QAEK,gBAAW,GAAG;YACjB,MAAM,CAAC,KAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACjC,CAAC,CAAC;QAEK,iBAAY,GAAG;YAClB,IAAM,KAAK,GAAG,KAAI,CAAC,QAAQ,EAAE,CAAC;YAE9B,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACT,MAAM,CAAC,KAAK,CAAC;YACjB,CAAC;YAED,IAAM,OAAO,GAAG,KAAI,CAAC,UAAU,EAAE,CAAC;YAClC,IAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;YAClC,IAAM,OAAO,GAAG,CAAC,SAAS,IAAI,CAAC,SAAS,GAAG,OAAO,GAAG,KAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAEvF,MAAM,CAAC,OAAO,CAAC;QACnB,CAAC,CAAC;QAEM,eAAU,GAAG;YACjB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC;QACrD,CAAC,CAAC;QAxFE,IAAI,CAAC,MAAM,GAAG;YACV,IAAI,EAAE,UAAU;YAChB,kBAAkB,EAAE;gBAChB,OAAO,EAAE,UAAU;gBACnB,SAAS,EAAE,YAAY;aAC1B;YACD,mBAAmB,EAAE,GAAG;SAC3B,CAAC;IACN,CAAC;IAiFL,wBAAC;AAAD,CAhGA,AAgGC,IAAA;AAhGY,iBAAiB;IAD7B,yCAAU,EAAE;qCAO4B,2BAAe;GAN3C,iBAAiB,CAgG7B;AAhGY,8CAAiB","file":"oauth-token-service.js","sourcesContent":["import { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport JwtTokenService, { JwtClaims } from './jwt-token-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nexport interface OAuthTokenConfig {\r\n    name: string;\r\n    urlTokenParameters?: {\r\n        idToken: string;\r\n        tokenType?: string;\r\n    };\r\n    expireOffsetSeconds?: number;\r\n}\r\n\r\nexport interface OAuthTokenData {\r\n    token: string;\r\n    tokenType: string;\r\n    expiresAt: number;\r\n    jwtClaims?: JwtClaims;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthTokenService {\r\n\r\n    public config: OAuthTokenConfig;\r\n\r\n    private tokenData: OAuthTokenData;\r\n\r\n    constructor(private jwtTokenService: JwtTokenService) {\r\n        this.config = {\r\n            name: 'id_token',\r\n            urlTokenParameters: {\r\n                idToken: 'id_token',\r\n                tokenType: 'token_type'\r\n            },\r\n            expireOffsetSeconds: 120\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthTokenConfig): OAuthTokenConfig => {\r\n\r\n        // Extend default configration with supplied config data\r\n        if (config.urlTokenParameters) {\r\n            config.urlTokenParameters = objectAssign(this.config.urlTokenParameters, config.urlTokenParameters);\r\n        }\r\n\r\n        this.config = objectAssign(this.config, config);\r\n\r\n        return config;\r\n    };\r\n\r\n    public createToken = (urlTokenData: any): OAuthTokenData => {\r\n        const token = urlTokenData[this.config.urlTokenParameters.idToken];\r\n        const tokenType = urlTokenData[this.config.urlTokenParameters.tokenType] || 'Bearer';\r\n\r\n        if (!token) {\r\n            return null;\r\n        }\r\n\r\n        const claims: JwtClaims = this.jwtTokenService.getJwtClaims(token);\r\n        const issuedTime = claims.nbf ? claims.nbf : claims.iat;\r\n        const expirationTime = claims.exp - issuedTime;\r\n\r\n        return {\r\n            token: token,\r\n            tokenType: tokenType,\r\n            expiresAt: this.getTimeNow() + expirationTime,\r\n            jwtClaims: claims\r\n        };\r\n    };\r\n\r\n    public setToken = (data: OAuthTokenData): OAuthTokenData => {\r\n        return this.tokenData = data;\r\n    };\r\n\r\n    public getToken = (): OAuthTokenData => {\r\n        return this.tokenData;\r\n    };\r\n\r\n    public getIdToken = (): string => {\r\n        return this.getToken() ? this.getToken().token : undefined;\r\n    };\r\n\r\n    public getAuthorizationHeader = (): string => {\r\n        if (!(this.getTokenType() && this.getIdToken())) {\r\n            return '';\r\n        }\r\n\r\n        const tokenType = this.getTokenType().charAt(0).toUpperCase() + this.getTokenType().substr(1);\r\n\r\n        return `${tokenType} ${this.getIdToken()}`;\r\n    };\r\n\r\n    public getTokenType = (): string => {\r\n        return this.getToken() ? this.getToken().tokenType : undefined;\r\n    };\r\n\r\n    public removeToken = (): OAuthTokenData => {\r\n        return this.tokenData = null;\r\n    };\r\n\r\n    public isTokenValid = (): boolean => {\r\n        const token = this.getToken();\r\n\r\n        if (!token) {\r\n            return false;\r\n        }\r\n\r\n        const timeNow = this.getTimeNow();\r\n        const expiresAt = token.expiresAt;\r\n        const isValid = (expiresAt && (expiresAt > timeNow + this.config.expireOffsetSeconds));\r\n\r\n        return isValid;\r\n    };\r\n\r\n    private getTimeNow = (): number => {\r\n        return Math.round(new Date().getTime() / 1000.0);\r\n    };\r\n}"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-token-service.ts"],"names":[],"mappings":"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","file":"oauth-token-service.js","sourcesContent":["import { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport JwtTokenService, { JwtClaims } from './jwt-token-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nexport interface OAuthTokenConfig {\r\n    name: string;\r\n    urlTokenParameters?: {\r\n        idToken: string;\r\n        tokenType?: string;\r\n    };\r\n    expireOffsetSeconds?: number;\r\n}\r\n\r\nexport interface OAuthTokenData {\r\n    token: string;\r\n    tokenType: string;\r\n    expiresAt: number;\r\n    jwtClaims?: JwtClaims;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthTokenService {\r\n\r\n    public config: OAuthTokenConfig;\r\n\r\n    private tokenData: OAuthTokenData;\r\n\r\n    constructor(private jwtTokenService: JwtTokenService) {\r\n        this.config = {\r\n            name: 'id_token',\r\n            urlTokenParameters: {\r\n                idToken: 'id_token',\r\n                tokenType: 'token_type'\r\n            },\r\n            expireOffsetSeconds: 60\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthTokenConfig): OAuthTokenConfig => {\r\n\r\n        // Extend default configration with supplied config data\r\n        if (config.urlTokenParameters) {\r\n            config.urlTokenParameters = objectAssign(this.config.urlTokenParameters, config.urlTokenParameters);\r\n        }\r\n\r\n        this.config = objectAssign(this.config, config);\r\n\r\n        return config;\r\n    };\r\n\r\n    public createToken = (urlTokenData: any): OAuthTokenData => {\r\n        const token = urlTokenData[this.config.urlTokenParameters.idToken];\r\n        const tokenType = urlTokenData[this.config.urlTokenParameters.tokenType] || 'Bearer';\r\n\r\n        if (!token) {\r\n            return null;\r\n        }\r\n\r\n        const claims: JwtClaims = this.jwtTokenService.getJwtClaims(token);\r\n        const issuedTime = claims.nbf ? claims.nbf : claims.iat;\r\n        const expirationTime = claims.exp - issuedTime;\r\n\r\n        return {\r\n            token: token,\r\n            tokenType: tokenType,\r\n            expiresAt: this.getTimeNow() + expirationTime,\r\n            jwtClaims: claims\r\n        };\r\n    };\r\n\r\n    public setToken = (data: OAuthTokenData): OAuthTokenData => {\r\n        return this.tokenData = data;\r\n    };\r\n\r\n    public getToken = (): OAuthTokenData => {\r\n        return this.tokenData;\r\n    };\r\n\r\n    public getIdToken = (): string => {\r\n        return this.getToken() ? this.getToken().token : undefined;\r\n    };\r\n\r\n    public getAuthorizationHeader = (): string => {\r\n        if (!(this.getTokenType() && this.getIdToken())) {\r\n            return '';\r\n        }\r\n\r\n        const tokenType = this.getTokenType().charAt(0).toUpperCase() + this.getTokenType().substr(1);\r\n\r\n        return `${tokenType} ${this.getIdToken()}`;\r\n    };\r\n\r\n    public getTokenType = (): string => {\r\n        return this.getToken() ? this.getToken().tokenType : undefined;\r\n    };\r\n\r\n    public getTokenExpirationTime = (): number => {\r\n        const tokenRenewalOffsetSeconds = 30;\r\n        const expireOffset = this.config.expireOffsetSeconds + tokenRenewalOffsetSeconds;\r\n\r\n        return (this.tokenData.expiresAt - this.getTimeNow() - expireOffset);\r\n    };\r\n\r\n    public removeToken = (): OAuthTokenData => {\r\n        return this.tokenData = null;\r\n    };\r\n\r\n    public isTokenValid = (): boolean => {\r\n        const token = this.getToken();\r\n\r\n        if (!token) {\r\n            return false;\r\n        }\r\n\r\n        const timeNow = this.getTimeNow();\r\n        const expiresAt = token.expiresAt;\r\n        const isValid = (expiresAt && (expiresAt > timeNow + this.config.expireOffsetSeconds));\r\n\r\n        return isValid;\r\n    };\r\n\r\n    private getTimeNow = (): number => {\r\n        return Math.round(new Date().getTime() / 1000.0);\r\n    };\r\n}"]} diff --git a/dist/commonjs/url-hash-service.js b/dist/commonjs/url-hash-service.js index ac7b710..4d09167 100644 --- a/dist/commonjs/url-hash-service.js +++ b/dist/commonjs/url-hash-service.js @@ -2,8 +2,8 @@ var UrlHashService = (function () { function UrlHashService() { var _this = this; - this.getHash = function () { - var hash = window.location.hash; + this.getHash = function (hashValue) { + var hash = hashValue ? hashValue : window.location.hash; if (hash.indexOf('#/') > -1) { hash = hash.substring(hash.indexOf('#/') + 2); } @@ -12,8 +12,8 @@ var UrlHashService = (function () { } return hash; }; - this.getHashData = function () { - var hash = _this.getHash(); + this.getHashData = function (hashValue) { + var hash = _this.getHash(hashValue); var searchRegex = /([^&=]+)=?([^&]*)/g; var hashData = {}; var match = searchRegex.exec(hash); @@ -37,4 +37,4 @@ var UrlHashService = (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = UrlHashService; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy91cmwtaGFzaC1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtJQUFBO1FBQUEsaUJBcUNDO1FBcENVLFlBQU8sR0FBRztZQUNiLElBQUksSUFBSSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDO1lBRWhDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUMxQixJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ2xELENBQUM7WUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ2hDLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzdCLENBQUM7WUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDO1FBQ2hCLENBQUMsQ0FBQztRQUVLLGdCQUFXLEdBQUc7WUFDakIsSUFBTSxJQUFJLEdBQUcsS0FBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQzVCLElBQU0sV0FBVyxHQUFHLG9CQUFvQixDQUFDO1lBQ3pDLElBQU0sUUFBUSxHQUFHLEVBQUUsQ0FBQztZQUVwQixJQUFJLEtBQUssR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ25DLE9BQU8sS0FBSyxFQUFFLENBQUM7Z0JBQ1gsSUFBTSxTQUFTLEdBQUcsS0FBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDL0MsSUFBTSxLQUFLLEdBQUcsS0FBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFFM0MsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEtBQUssQ0FBQztnQkFDNUIsS0FBSyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkMsQ0FBQztZQUVELE1BQU0sQ0FBQyxRQUFRLENBQUM7UUFDcEIsQ0FBQyxDQUFDO1FBRUssY0FBUyxHQUFHO1lBQ2YsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQzlCLENBQUMsQ0FBQztRQUVNLGtCQUFhLEdBQUcsVUFBQyxDQUFTO1lBQzlCLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ3JELENBQUMsQ0FBQztJQUNOLENBQUM7SUFBRCxxQkFBQztBQUFELENBckNBLEFBcUNDLElBQUEiLCJmaWxlIjoidXJsLWhhc2gtc2VydmljZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBkZWZhdWx0IGNsYXNzIFVybEhhc2hTZXJ2aWNlIHtcclxuICAgIHB1YmxpYyBnZXRIYXNoID0gKCk6IHN0cmluZyA9PiB7XHJcbiAgICAgICAgbGV0IGhhc2ggPSB3aW5kb3cubG9jYXRpb24uaGFzaDtcclxuXHJcbiAgICAgICAgaWYgKGhhc2guaW5kZXhPZignIy8nKSA+IC0xKSB7XHJcbiAgICAgICAgICAgIGhhc2ggPSBoYXNoLnN1YnN0cmluZyhoYXNoLmluZGV4T2YoJyMvJykgKyAyKTtcclxuICAgICAgICB9IGVsc2UgaWYgKGhhc2guaW5kZXhPZignIycpID4gLTEpIHtcclxuICAgICAgICAgICAgaGFzaCA9IGhhc2guc3Vic3RyaW5nKDEpO1xyXG4gICAgICAgIH1cclxuXHJcbiAgICAgICAgcmV0dXJuIGhhc2g7XHJcbiAgICB9O1xyXG5cclxuICAgIHB1YmxpYyBnZXRIYXNoRGF0YSA9ICgpOiBhbnkgPT4ge1xyXG4gICAgICAgIGNvbnN0IGhhc2ggPSB0aGlzLmdldEhhc2goKTtcclxuICAgICAgICBjb25zdCBzZWFyY2hSZWdleCA9IC8oW14mPV0rKT0/KFteJl0qKS9nO1xyXG4gICAgICAgIGNvbnN0IGhhc2hEYXRhID0ge307XHJcblxyXG4gICAgICAgIGxldCBtYXRjaCA9IHNlYXJjaFJlZ2V4LmV4ZWMoaGFzaCk7XHJcbiAgICAgICAgd2hpbGUgKG1hdGNoKSB7XHJcbiAgICAgICAgICAgIGNvbnN0IHBhcmFtZXRlciA9IHRoaXMuZGVjb2RlVXJsRGF0YShtYXRjaFsxXSk7XHJcbiAgICAgICAgICAgIGNvbnN0IHZhbHVlID0gdGhpcy5kZWNvZGVVcmxEYXRhKG1hdGNoWzJdKTtcclxuXHJcbiAgICAgICAgICAgIGhhc2hEYXRhW3BhcmFtZXRlcl0gPSB2YWx1ZTtcclxuICAgICAgICAgICAgbWF0Y2ggPSBzZWFyY2hSZWdleC5leGVjKGhhc2gpO1xyXG4gICAgICAgIH1cclxuXHJcbiAgICAgICAgcmV0dXJuIGhhc2hEYXRhO1xyXG4gICAgfTtcclxuXHJcbiAgICBwdWJsaWMgY2xlYXJIYXNoID0gKCk6IHZvaWQgPT4ge1xyXG4gICAgICAgIHdpbmRvdy5sb2NhdGlvbi5oYXNoID0gJyc7XHJcbiAgICB9O1xyXG5cclxuICAgIHByaXZhdGUgZGVjb2RlVXJsRGF0YSA9IChzOiBzdHJpbmcpOiBzdHJpbmcgPT4ge1xyXG4gICAgICAgIHJldHVybiBkZWNvZGVVUklDb21wb25lbnQocy5yZXBsYWNlKC9cXCsvZywgJyAnKSk7XHJcbiAgICB9O1xyXG59Il19 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy91cmwtaGFzaC1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtJQUFBO1FBQUEsaUJBcUNDO1FBcENVLFlBQU8sR0FBRyxVQUFDLFNBQWtCO1lBQ2hDLElBQUksSUFBSSxHQUFHLFNBQVMsR0FBRyxTQUFTLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUM7WUFFeEQsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQzFCLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDbEQsQ0FBQztZQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDaEMsSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDN0IsQ0FBQztZQUVELE1BQU0sQ0FBQyxJQUFJLENBQUM7UUFDaEIsQ0FBQyxDQUFDO1FBRUssZ0JBQVcsR0FBRyxVQUFDLFNBQWtCO1lBQ3BDLElBQU0sSUFBSSxHQUFHLEtBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDckMsSUFBTSxXQUFXLEdBQUcsb0JBQW9CLENBQUM7WUFDekMsSUFBTSxRQUFRLEdBQUcsRUFBRSxDQUFDO1lBRXBCLElBQUksS0FBSyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkMsT0FBTyxLQUFLLEVBQUUsQ0FBQztnQkFDWCxJQUFNLFNBQVMsR0FBRyxLQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUMvQyxJQUFNLEtBQUssR0FBRyxLQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUUzQyxRQUFRLENBQUMsU0FBUyxDQUFDLEdBQUcsS0FBSyxDQUFDO2dCQUM1QixLQUFLLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQyxDQUFDO1lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQztRQUNwQixDQUFDLENBQUM7UUFFSyxjQUFTLEdBQUc7WUFDZixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7UUFDOUIsQ0FBQyxDQUFDO1FBRU0sa0JBQWEsR0FBRyxVQUFDLENBQVM7WUFDOUIsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDckQsQ0FBQyxDQUFDO0lBQ04sQ0FBQztJQUFELHFCQUFDO0FBQUQsQ0FyQ0EsQUFxQ0MsSUFBQSIsImZpbGUiOiJ1cmwtaGFzaC1zZXJ2aWNlLmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGRlZmF1bHQgY2xhc3MgVXJsSGFzaFNlcnZpY2Uge1xyXG4gICAgcHVibGljIGdldEhhc2ggPSAoaGFzaFZhbHVlPzogc3RyaW5nKTogc3RyaW5nID0+IHtcclxuICAgICAgICBsZXQgaGFzaCA9IGhhc2hWYWx1ZSA/IGhhc2hWYWx1ZSA6IHdpbmRvdy5sb2NhdGlvbi5oYXNoO1xyXG5cclxuICAgICAgICBpZiAoaGFzaC5pbmRleE9mKCcjLycpID4gLTEpIHtcclxuICAgICAgICAgICAgaGFzaCA9IGhhc2guc3Vic3RyaW5nKGhhc2guaW5kZXhPZignIy8nKSArIDIpO1xyXG4gICAgICAgIH0gZWxzZSBpZiAoaGFzaC5pbmRleE9mKCcjJykgPiAtMSkge1xyXG4gICAgICAgICAgICBoYXNoID0gaGFzaC5zdWJzdHJpbmcoMSk7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICByZXR1cm4gaGFzaDtcclxuICAgIH07XHJcblxyXG4gICAgcHVibGljIGdldEhhc2hEYXRhID0gKGhhc2hWYWx1ZT86IHN0cmluZyk6IGFueSA9PiB7XHJcbiAgICAgICAgY29uc3QgaGFzaCA9IHRoaXMuZ2V0SGFzaChoYXNoVmFsdWUpO1xyXG4gICAgICAgIGNvbnN0IHNlYXJjaFJlZ2V4ID0gLyhbXiY9XSspPT8oW14mXSopL2c7XHJcbiAgICAgICAgY29uc3QgaGFzaERhdGEgPSB7fTtcclxuXHJcbiAgICAgICAgbGV0IG1hdGNoID0gc2VhcmNoUmVnZXguZXhlYyhoYXNoKTtcclxuICAgICAgICB3aGlsZSAobWF0Y2gpIHtcclxuICAgICAgICAgICAgY29uc3QgcGFyYW1ldGVyID0gdGhpcy5kZWNvZGVVcmxEYXRhKG1hdGNoWzFdKTtcclxuICAgICAgICAgICAgY29uc3QgdmFsdWUgPSB0aGlzLmRlY29kZVVybERhdGEobWF0Y2hbMl0pO1xyXG5cclxuICAgICAgICAgICAgaGFzaERhdGFbcGFyYW1ldGVyXSA9IHZhbHVlO1xyXG4gICAgICAgICAgICBtYXRjaCA9IHNlYXJjaFJlZ2V4LmV4ZWMoaGFzaCk7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICByZXR1cm4gaGFzaERhdGE7XHJcbiAgICB9O1xyXG5cclxuICAgIHB1YmxpYyBjbGVhckhhc2ggPSAoKTogdm9pZCA9PiB7XHJcbiAgICAgICAgd2luZG93LmxvY2F0aW9uLmhhc2ggPSAnJztcclxuICAgIH07XHJcblxyXG4gICAgcHJpdmF0ZSBkZWNvZGVVcmxEYXRhID0gKHM6IHN0cmluZyk6IHN0cmluZyA9PiB7XHJcbiAgICAgICAgcmV0dXJuIGRlY29kZVVSSUNvbXBvbmVudChzLnJlcGxhY2UoL1xcKy9nLCAnICcpKTtcclxuICAgIH07XHJcbn0iXX0= diff --git a/dist/dts/oauth-service.d.ts b/dist/dts/oauth-service.d.ts index 5f43730..1b8ad89 100644 --- a/dist/dts/oauth-service.d.ts +++ b/dist/dts/oauth-service.d.ts @@ -11,6 +11,7 @@ export interface OAuthConfig { state?: string; redirectUri?: string; alwaysRequireLogin?: boolean; + autoTokenRenewal?: boolean; } export declare class OAuthService { private oAuthTokenService; @@ -32,4 +33,6 @@ export declare class OAuthService { private getTokenDataFromUrl; private getBaseRouteUrl; private getSimpleNonceValue; + private getRedirectUrl(); + private setAutomaticTokenRenewal(); } diff --git a/dist/dts/oauth-token-service.d.ts b/dist/dts/oauth-token-service.d.ts index 8f64df8..0bea72e 100644 --- a/dist/dts/oauth-token-service.d.ts +++ b/dist/dts/oauth-token-service.d.ts @@ -25,6 +25,7 @@ export declare class OAuthTokenService { getIdToken: () => string; getAuthorizationHeader: () => string; getTokenType: () => string; + getTokenExpirationTime: () => number; removeToken: () => OAuthTokenData; isTokenValid: () => boolean; private getTimeNow; diff --git a/dist/dts/url-hash-service.d.ts b/dist/dts/url-hash-service.d.ts index 5dd53b5..3dbf9d5 100644 --- a/dist/dts/url-hash-service.d.ts +++ b/dist/dts/url-hash-service.d.ts @@ -1,6 +1,6 @@ export default class UrlHashService { - getHash: () => string; - getHashData: () => any; + getHash: (hashValue?: string) => string; + getHashData: (hashValue?: string) => any; clearHash: () => void; private decodeUrlData; } diff --git a/dist/es6/oauth-service.js b/dist/es6/oauth-service.js index e82055f..0c1a687 100644 --- a/dist/es6/oauth-service.js +++ b/dist/es6/oauth-service.js @@ -67,18 +67,7 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ return _this.oAuthTokenService.getToken(); }; this.login = function () { - var redirectUrl = _this.config.loginUrl + "?" + - ("response_type=" + _this.oAuthTokenService.config.name + "&") + - ("client_id=" + encodeURIComponent(_this.config.clientId) + "&") + - ("redirect_uri=" + encodeURIComponent(_this.config.redirectUri) + "&") + - ("nonce=" + encodeURIComponent(_this.getSimpleNonceValue())); - if (_this.config.scope) { - redirectUrl += "&scope=" + encodeURIComponent(_this.config.scope); - } - if (_this.config.state) { - redirectUrl += "&state=" + encodeURIComponent(_this.config.state); - } - window.location.href = redirectUrl; + window.location.href = _this.getRedirectUrl(); }; this.logout = function () { var redirectUrl = _this.config.logoutUrl + "?" + @@ -113,6 +102,9 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ window.location.href = _this.getBaseRouteUrl(); } _this.eventAggregator.publish(OAuthService_1.LOGIN_SUCCESS_EVENT, tokenData); + if (_this.config.autoTokenRenewal) { + _this.setAutomaticTokenRenewal(); + } } }; this.isLoginRequired = function (state) { @@ -120,8 +112,8 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ var routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false; return routeHasConfig ? routeRequiresLogin : _this.config.alwaysRequireLogin; }; - this.getTokenDataFromUrl = function () { - var hashData = _this.urlHashService.getHashData(); + this.getTokenDataFromUrl = function (hash) { + var hashData = _this.urlHashService.getHashData(hash); var tokenData = _this.oAuthTokenService.createToken(hashData); return tokenData; }; @@ -138,7 +130,8 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ logoutRedirectParameterName: 'post_logout_redirect_uri', scope: null, state: null, - alwaysRequireLogin: false + alwaysRequireLogin: false, + autoTokenRenewal: true }; } Object.defineProperty(OAuthService, "LOGIN_SUCCESS_EVENT", { @@ -151,6 +144,44 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ enumerable: true, configurable: true }); + OAuthService.prototype.getRedirectUrl = function () { + var redirectUrl = this.config.loginUrl + "?" + + ("response_type=" + this.oAuthTokenService.config.name + "&") + + ("client_id=" + encodeURIComponent(this.config.clientId) + "&") + + ("redirect_uri=" + encodeURIComponent(this.config.redirectUri) + "&") + + ("nonce=" + encodeURIComponent(this.getSimpleNonceValue())); + if (this.config.scope) { + redirectUrl += "&scope=" + encodeURIComponent(this.config.scope); + } + if (this.config.state) { + redirectUrl += "&state=" + encodeURIComponent(this.config.state); + } + return redirectUrl; + }; + OAuthService.prototype.setAutomaticTokenRenewal = function () { + var _this = this; + var tokenExpirationTime = this.oAuthTokenService.getTokenExpirationTime() * 1000; + setTimeout(function () { + var iFrame = document.createElement('iframe'); + iFrame.src = _this.getRedirectUrl(); + iFrame.style.display = 'none'; + iFrame.onload = function (event) { + try { + var hashWithNewToken = iFrame.contentWindow.location.hash; + document.body.removeChild(iFrame); + var tokenData = _this.getTokenDataFromUrl(hashWithNewToken); + if (tokenData) { + _this.oAuthTokenService.setToken(tokenData); + _this.setAutomaticTokenRenewal(); + } + } + catch (ex) { + document.body.removeChild(iFrame); + } + }; + document.body.appendChild(iFrame); + }, tokenExpirationTime); + }; return OAuthService; }()); OAuthService = OAuthService_1 = __decorate([ @@ -165,4 +196,4 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ }; }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-service.ts"],"names":[],"mappings":"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","file":"oauth-service.js","sourcesContent":["import { EventAggregator } from 'aurelia-event-aggregator';\r\nimport { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport { OAuthTokenService, OAuthTokenData } from './oauth-token-service';\r\nimport UrlHashService from './url-hash-service';\r\nimport LocalStorageService from './local-storage-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nconst OAUTH_STARTPAGE_STORAGE_KEY: string = 'oauth.startPage';\r\n\r\nexport interface OAuthConfig {\r\n    loginUrl: string;\r\n    logoutUrl: string;\r\n    clientId: string;\r\n    logoutRedirectParameterName?: string;\r\n    scope?: string;\r\n    state?: string;\r\n    redirectUri?: string;\r\n    alwaysRequireLogin?: boolean;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthService {\r\n\r\n    public config: OAuthConfig;\r\n\r\n    private defaults: OAuthConfig;\r\n\r\n    public static get LOGIN_SUCCESS_EVENT(): string { return 'oauth:loginSuccess'; }\r\n    public static get INVALID_TOKEN_EVENT(): string { return 'oauth:invalidToken'; }\r\n\r\n    constructor(\r\n        private oAuthTokenService: OAuthTokenService,\r\n        private urlHashService: UrlHashService,\r\n        private localStorageService: LocalStorageService,\r\n        private eventAggregator: EventAggregator) {\r\n\r\n        this.defaults = {\r\n            loginUrl: null,\r\n            logoutUrl: null,\r\n            clientId: null,\r\n            logoutRedirectParameterName: 'post_logout_redirect_uri',\r\n            scope: null,\r\n            state: null,\r\n            alwaysRequireLogin: false\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthConfig): OAuthConfig => {\r\n        if (this.config) {\r\n            throw new Error('OAuthProvider already configured.');\r\n        }\r\n\r\n        // Remove trailing slash from urls.\r\n        if (config.loginUrl.substr(-1) === '/') {\r\n            config.loginUrl = config.loginUrl.slice(0, -1);\r\n        }\r\n\r\n        if (config.logoutUrl.substr(-1) === '/') {\r\n            config.logoutUrl = config.logoutUrl.slice(0, -1);\r\n        }\r\n\r\n        // Extend default configuration.\r\n        this.config = objectAssign(this.defaults, config);\r\n\r\n        // Redirect is set to current location by default\r\n        const existingHash = window.location.hash;\r\n        let pathDefault = window.location.href;\r\n\r\n        // Remove not needed parts from urls.\r\n        if (existingHash) {\r\n            pathDefault = pathDefault.replace(existingHash, '');\r\n        }\r\n\r\n        if (pathDefault.substr(-1) === '#') {\r\n            pathDefault = pathDefault.slice(0, -1);\r\n        }\r\n\r\n        this.config.redirectUri = config.redirectUri || pathDefault;\r\n\r\n        return config;\r\n    };\r\n\r\n    public isAuthenticated = (): boolean => {\r\n        return <any>this.oAuthTokenService.getToken();\r\n    };\r\n\r\n    public login = (): void => {\r\n        let redirectUrl = `${this.config.loginUrl}?` +\r\n            `response_type=${this.oAuthTokenService.config.name}&` +\r\n            `client_id=${encodeURIComponent(this.config.clientId)}&` +\r\n            `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` +\r\n            `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`;\r\n\r\n        if (this.config.scope) {\r\n            redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`;\r\n        }\r\n\r\n        if (this.config.state) {\r\n            redirectUrl += `&state=${encodeURIComponent(this.config.state)}`;\r\n        }\r\n\r\n        window.location.href = redirectUrl;\r\n    };\r\n\r\n    public logout = (): void => {\r\n        const redirectUrl = `${this.config.logoutUrl}?` +\r\n            `${this.config.logoutRedirectParameterName}=${encodeURIComponent(this.config.redirectUri)}`;\r\n\r\n        window.location.href = redirectUrl;\r\n        this.oAuthTokenService.removeToken();\r\n    };\r\n\r\n    public loginOnStateChange = (toState): boolean => {\r\n        if (toState && this.isLoginRequired(toState) && !this.isAuthenticated() && !this.getTokenDataFromUrl()) {\r\n\r\n            if (this.localStorageService.isStorageSupported()) {\r\n                let url = window.location.href;\r\n\r\n                if (!window.location.hash) {\r\n                    url = this.getBaseRouteUrl();\r\n                }\r\n\r\n                this.localStorageService.set<string>(OAUTH_STARTPAGE_STORAGE_KEY, url);\r\n            }\r\n\r\n            this.login();\r\n\r\n            return true;\r\n        }\r\n\r\n        return false;\r\n    };\r\n\r\n    public setTokenOnRedirect = (): void => {\r\n        const tokenData = this.getTokenDataFromUrl();\r\n\r\n        if (!this.isAuthenticated() && tokenData) {\r\n            this.oAuthTokenService.setToken(tokenData);\r\n\r\n            if (this.localStorageService.isStorageSupported() && this.localStorageService.get(OAUTH_STARTPAGE_STORAGE_KEY)) {\r\n                const startPage = this.localStorageService.get<string>(OAUTH_STARTPAGE_STORAGE_KEY);\r\n\r\n                this.localStorageService.remove(OAUTH_STARTPAGE_STORAGE_KEY);\r\n                window.location.href = startPage;\r\n            } else {\r\n                // Redirect to the base application route\r\n                window.location.href = this.getBaseRouteUrl();\r\n            }\r\n\r\n            this.eventAggregator.publish(OAuthService.LOGIN_SUCCESS_EVENT, tokenData);\r\n        }\r\n    };\r\n\r\n    private isLoginRequired = (state): boolean => {\r\n        const routeHasConfig = state.settings && state.settings.requireLogin !== undefined;\r\n        const routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false;\r\n\r\n        return routeHasConfig ? routeRequiresLogin : this.config.alwaysRequireLogin;\r\n    };\r\n\r\n    private getTokenDataFromUrl = (): OAuthTokenData => {\r\n        const hashData = this.urlHashService.getHashData();\r\n        const tokenData = this.oAuthTokenService.createToken(hashData);\r\n\r\n        return tokenData;\r\n    };\r\n\r\n    private getBaseRouteUrl = (): string => {\r\n        return window.location.origin + '/#/';\r\n    }\r\n\r\n    private getSimpleNonceValue = (): string => {\r\n        return ((Date.now() + Math.random()) * Math.random()).toString().replace('.', '');\r\n    }\r\n}"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-service.ts"],"names":[],"mappings":"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","file":"oauth-service.js","sourcesContent":["import { EventAggregator } from 'aurelia-event-aggregator';\r\nimport { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport { OAuthTokenService, OAuthTokenData } from './oauth-token-service';\r\nimport UrlHashService from './url-hash-service';\r\nimport LocalStorageService from './local-storage-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nconst OAUTH_STARTPAGE_STORAGE_KEY: string = 'oauth.startPage';\r\n\r\nexport interface OAuthConfig {\r\n    loginUrl: string;\r\n    logoutUrl: string;\r\n    clientId: string;\r\n    logoutRedirectParameterName?: string;\r\n    scope?: string;\r\n    state?: string;\r\n    redirectUri?: string;\r\n    alwaysRequireLogin?: boolean;\r\n    autoTokenRenewal?: boolean;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthService {\r\n\r\n    public config: OAuthConfig;\r\n\r\n    private defaults: OAuthConfig;\r\n\r\n    public static get LOGIN_SUCCESS_EVENT(): string { return 'oauth:loginSuccess'; }\r\n    public static get INVALID_TOKEN_EVENT(): string { return 'oauth:invalidToken'; }\r\n\r\n    constructor(\r\n        private oAuthTokenService: OAuthTokenService,\r\n        private urlHashService: UrlHashService,\r\n        private localStorageService: LocalStorageService,\r\n        private eventAggregator: EventAggregator) {\r\n\r\n        this.defaults = {\r\n            loginUrl: null,\r\n            logoutUrl: null,\r\n            clientId: null,\r\n            logoutRedirectParameterName: 'post_logout_redirect_uri',\r\n            scope: null,\r\n            state: null,\r\n            alwaysRequireLogin: false,\r\n            autoTokenRenewal: true\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthConfig): OAuthConfig => {\r\n        if (this.config) {\r\n            throw new Error('OAuthProvider already configured.');\r\n        }\r\n\r\n        // Remove trailing slash from urls.\r\n        if (config.loginUrl.substr(-1) === '/') {\r\n            config.loginUrl = config.loginUrl.slice(0, -1);\r\n        }\r\n\r\n        if (config.logoutUrl.substr(-1) === '/') {\r\n            config.logoutUrl = config.logoutUrl.slice(0, -1);\r\n        }\r\n\r\n        // Extend default configuration.\r\n        this.config = objectAssign(this.defaults, config);\r\n\r\n        // Redirect is set to current location by default\r\n        const existingHash = window.location.hash;\r\n        let pathDefault = window.location.href;\r\n\r\n        // Remove not needed parts from urls.\r\n        if (existingHash) {\r\n            pathDefault = pathDefault.replace(existingHash, '');\r\n        }\r\n\r\n        if (pathDefault.substr(-1) === '#') {\r\n            pathDefault = pathDefault.slice(0, -1);\r\n        }\r\n\r\n        this.config.redirectUri = config.redirectUri || pathDefault;\r\n\r\n        return config;\r\n    };\r\n\r\n    public isAuthenticated = (): boolean => {\r\n        return <any>this.oAuthTokenService.getToken();\r\n    };\r\n\r\n    public login = (): void => {\r\n        window.location.href = this.getRedirectUrl();\r\n    };\r\n\r\n    public logout = (): void => {\r\n        const redirectUrl = `${this.config.logoutUrl}?` +\r\n            `${this.config.logoutRedirectParameterName}=${encodeURIComponent(this.config.redirectUri)}`;\r\n\r\n        window.location.href = redirectUrl;\r\n        this.oAuthTokenService.removeToken();\r\n    };\r\n\r\n    public loginOnStateChange = (toState): boolean => {\r\n        if (toState && this.isLoginRequired(toState) && !this.isAuthenticated() && !this.getTokenDataFromUrl()) {\r\n\r\n            if (this.localStorageService.isStorageSupported()) {\r\n                let url = window.location.href;\r\n\r\n                if (!window.location.hash) {\r\n                    url = this.getBaseRouteUrl();\r\n                }\r\n\r\n                this.localStorageService.set<string>(OAUTH_STARTPAGE_STORAGE_KEY, url);\r\n            }\r\n\r\n            this.login();\r\n\r\n            return true;\r\n        }\r\n\r\n        return false;\r\n    };\r\n\r\n    public setTokenOnRedirect = (): void => {\r\n        const tokenData = this.getTokenDataFromUrl();\r\n\r\n        if (!this.isAuthenticated() && tokenData) {\r\n            this.oAuthTokenService.setToken(tokenData);\r\n\r\n            if (this.localStorageService.isStorageSupported() && this.localStorageService.get(OAUTH_STARTPAGE_STORAGE_KEY)) {\r\n                const startPage = this.localStorageService.get<string>(OAUTH_STARTPAGE_STORAGE_KEY);\r\n\r\n                this.localStorageService.remove(OAUTH_STARTPAGE_STORAGE_KEY);\r\n                window.location.href = startPage;\r\n            } else {\r\n                // Redirect to the base application route\r\n                window.location.href = this.getBaseRouteUrl();\r\n            }\r\n\r\n            this.eventAggregator.publish(OAuthService.LOGIN_SUCCESS_EVENT, tokenData);\r\n\r\n            if (this.config.autoTokenRenewal) {\r\n                this.setAutomaticTokenRenewal();\r\n            }\r\n        }\r\n    };\r\n\r\n    private isLoginRequired = (state): boolean => {\r\n        const routeHasConfig = state.settings && state.settings.requireLogin !== undefined;\r\n        const routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false;\r\n\r\n        return routeHasConfig ? routeRequiresLogin : this.config.alwaysRequireLogin;\r\n    };\r\n\r\n    private getTokenDataFromUrl = (hash?: string): OAuthTokenData => {\r\n        const hashData = this.urlHashService.getHashData(hash);\r\n        const tokenData = this.oAuthTokenService.createToken(hashData);\r\n\r\n        return tokenData;\r\n    };\r\n\r\n    private getBaseRouteUrl = (): string => {\r\n        return window.location.origin + '/#/';\r\n    }\r\n\r\n    private getSimpleNonceValue = (): string => {\r\n        return ((Date.now() + Math.random()) * Math.random()).toString().replace('.', '');\r\n    }\r\n\r\n    private getRedirectUrl() {\r\n        let redirectUrl = `${this.config.loginUrl}?` +\r\n            `response_type=${this.oAuthTokenService.config.name}&` +\r\n            `client_id=${encodeURIComponent(this.config.clientId)}&` +\r\n            `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` +\r\n            `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`;\r\n\r\n        if (this.config.scope) {\r\n            redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`;\r\n        }\r\n\r\n        if (this.config.state) {\r\n            redirectUrl += `&state=${encodeURIComponent(this.config.state)}`;\r\n        }\r\n\r\n        return redirectUrl;\r\n    }\r\n\r\n    private setAutomaticTokenRenewal() {\r\n        const tokenExpirationTime = this.oAuthTokenService.getTokenExpirationTime() * 1000;\r\n\r\n        setTimeout(() => {\r\n            const iFrame = document.createElement('iframe');\r\n            iFrame.src = this.getRedirectUrl();\r\n            iFrame.style.display = 'none';\r\n            iFrame.onload = (event) => {\r\n                try {\r\n                    const hashWithNewToken = iFrame.contentWindow.location.hash;\r\n                    document.body.removeChild(iFrame);\r\n\r\n                    const tokenData = this.getTokenDataFromUrl(hashWithNewToken);\r\n\r\n                    if (tokenData) {\r\n                        this.oAuthTokenService.setToken(tokenData);\r\n                        this.setAutomaticTokenRenewal();\r\n                    }\r\n                } catch (ex) {\r\n                    // iFrame.contentWindow can fail when an iframe loads identity server login page\r\n                    // but this page will not redirect back to the app url waiting for the user to login in\r\n                    // this behaviour my occur i.e. when login page authentication cookies expire\r\n                    document.body.removeChild(iFrame);\r\n                }\r\n            };\r\n\r\n            document.body.appendChild(iFrame);\r\n        }, tokenExpirationTime);\r\n    }\r\n}"]} diff --git a/dist/es6/oauth-token-service.js b/dist/es6/oauth-token-service.js index e64aeeb..fc18a06 100644 --- a/dist/es6/oauth-token-service.js +++ b/dist/es6/oauth-token-service.js @@ -70,6 +70,11 @@ System.register(["aurelia-dependency-injection", "./jwt-token-service", "./oauth this.getTokenType = function () { return _this.getToken() ? _this.getToken().tokenType : undefined; }; + this.getTokenExpirationTime = function () { + var tokenRenewalOffsetSeconds = 30; + var expireOffset = _this.config.expireOffsetSeconds + tokenRenewalOffsetSeconds; + return (_this.tokenData.expiresAt - _this.getTimeNow() - expireOffset); + }; this.removeToken = function () { return _this.tokenData = null; }; @@ -92,7 +97,7 @@ System.register(["aurelia-dependency-injection", "./jwt-token-service", "./oauth idToken: 'id_token', tokenType: 'token_type' }, - expireOffsetSeconds: 120 + expireOffsetSeconds: 60 }; } return OAuthTokenService; @@ -106,4 +111,4 @@ System.register(["aurelia-dependency-injection", "./jwt-token-service", "./oauth }; }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-token-service.ts"],"names":[],"mappings":"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","file":"oauth-token-service.js","sourcesContent":["import { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport JwtTokenService, { JwtClaims } from './jwt-token-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nexport interface OAuthTokenConfig {\r\n    name: string;\r\n    urlTokenParameters?: {\r\n        idToken: string;\r\n        tokenType?: string;\r\n    };\r\n    expireOffsetSeconds?: number;\r\n}\r\n\r\nexport interface OAuthTokenData {\r\n    token: string;\r\n    tokenType: string;\r\n    expiresAt: number;\r\n    jwtClaims?: JwtClaims;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthTokenService {\r\n\r\n    public config: OAuthTokenConfig;\r\n\r\n    private tokenData: OAuthTokenData;\r\n\r\n    constructor(private jwtTokenService: JwtTokenService) {\r\n        this.config = {\r\n            name: 'id_token',\r\n            urlTokenParameters: {\r\n                idToken: 'id_token',\r\n                tokenType: 'token_type'\r\n            },\r\n            expireOffsetSeconds: 120\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthTokenConfig): OAuthTokenConfig => {\r\n\r\n        // Extend default configration with supplied config data\r\n        if (config.urlTokenParameters) {\r\n            config.urlTokenParameters = objectAssign(this.config.urlTokenParameters, config.urlTokenParameters);\r\n        }\r\n\r\n        this.config = objectAssign(this.config, config);\r\n\r\n        return config;\r\n    };\r\n\r\n    public createToken = (urlTokenData: any): OAuthTokenData => {\r\n        const token = urlTokenData[this.config.urlTokenParameters.idToken];\r\n        const tokenType = urlTokenData[this.config.urlTokenParameters.tokenType] || 'Bearer';\r\n\r\n        if (!token) {\r\n            return null;\r\n        }\r\n\r\n        const claims: JwtClaims = this.jwtTokenService.getJwtClaims(token);\r\n        const issuedTime = claims.nbf ? claims.nbf : claims.iat;\r\n        const expirationTime = claims.exp - issuedTime;\r\n\r\n        return {\r\n            token: token,\r\n            tokenType: tokenType,\r\n            expiresAt: this.getTimeNow() + expirationTime,\r\n            jwtClaims: claims\r\n        };\r\n    };\r\n\r\n    public setToken = (data: OAuthTokenData): OAuthTokenData => {\r\n        return this.tokenData = data;\r\n    };\r\n\r\n    public getToken = (): OAuthTokenData => {\r\n        return this.tokenData;\r\n    };\r\n\r\n    public getIdToken = (): string => {\r\n        return this.getToken() ? this.getToken().token : undefined;\r\n    };\r\n\r\n    public getAuthorizationHeader = (): string => {\r\n        if (!(this.getTokenType() && this.getIdToken())) {\r\n            return '';\r\n        }\r\n\r\n        const tokenType = this.getTokenType().charAt(0).toUpperCase() + this.getTokenType().substr(1);\r\n\r\n        return `${tokenType} ${this.getIdToken()}`;\r\n    };\r\n\r\n    public getTokenType = (): string => {\r\n        return this.getToken() ? this.getToken().tokenType : undefined;\r\n    };\r\n\r\n    public removeToken = (): OAuthTokenData => {\r\n        return this.tokenData = null;\r\n    };\r\n\r\n    public isTokenValid = (): boolean => {\r\n        const token = this.getToken();\r\n\r\n        if (!token) {\r\n            return false;\r\n        }\r\n\r\n        const timeNow = this.getTimeNow();\r\n        const expiresAt = token.expiresAt;\r\n        const isValid = (expiresAt && (expiresAt > timeNow + this.config.expireOffsetSeconds));\r\n\r\n        return isValid;\r\n    };\r\n\r\n    private getTimeNow = (): number => {\r\n        return Math.round(new Date().getTime() / 1000.0);\r\n    };\r\n}"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-token-service.ts"],"names":[],"mappings":"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","file":"oauth-token-service.js","sourcesContent":["import { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport JwtTokenService, { JwtClaims } from './jwt-token-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nexport interface OAuthTokenConfig {\r\n    name: string;\r\n    urlTokenParameters?: {\r\n        idToken: string;\r\n        tokenType?: string;\r\n    };\r\n    expireOffsetSeconds?: number;\r\n}\r\n\r\nexport interface OAuthTokenData {\r\n    token: string;\r\n    tokenType: string;\r\n    expiresAt: number;\r\n    jwtClaims?: JwtClaims;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthTokenService {\r\n\r\n    public config: OAuthTokenConfig;\r\n\r\n    private tokenData: OAuthTokenData;\r\n\r\n    constructor(private jwtTokenService: JwtTokenService) {\r\n        this.config = {\r\n            name: 'id_token',\r\n            urlTokenParameters: {\r\n                idToken: 'id_token',\r\n                tokenType: 'token_type'\r\n            },\r\n            expireOffsetSeconds: 60\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthTokenConfig): OAuthTokenConfig => {\r\n\r\n        // Extend default configration with supplied config data\r\n        if (config.urlTokenParameters) {\r\n            config.urlTokenParameters = objectAssign(this.config.urlTokenParameters, config.urlTokenParameters);\r\n        }\r\n\r\n        this.config = objectAssign(this.config, config);\r\n\r\n        return config;\r\n    };\r\n\r\n    public createToken = (urlTokenData: any): OAuthTokenData => {\r\n        const token = urlTokenData[this.config.urlTokenParameters.idToken];\r\n        const tokenType = urlTokenData[this.config.urlTokenParameters.tokenType] || 'Bearer';\r\n\r\n        if (!token) {\r\n            return null;\r\n        }\r\n\r\n        const claims: JwtClaims = this.jwtTokenService.getJwtClaims(token);\r\n        const issuedTime = claims.nbf ? claims.nbf : claims.iat;\r\n        const expirationTime = claims.exp - issuedTime;\r\n\r\n        return {\r\n            token: token,\r\n            tokenType: tokenType,\r\n            expiresAt: this.getTimeNow() + expirationTime,\r\n            jwtClaims: claims\r\n        };\r\n    };\r\n\r\n    public setToken = (data: OAuthTokenData): OAuthTokenData => {\r\n        return this.tokenData = data;\r\n    };\r\n\r\n    public getToken = (): OAuthTokenData => {\r\n        return this.tokenData;\r\n    };\r\n\r\n    public getIdToken = (): string => {\r\n        return this.getToken() ? this.getToken().token : undefined;\r\n    };\r\n\r\n    public getAuthorizationHeader = (): string => {\r\n        if (!(this.getTokenType() && this.getIdToken())) {\r\n            return '';\r\n        }\r\n\r\n        const tokenType = this.getTokenType().charAt(0).toUpperCase() + this.getTokenType().substr(1);\r\n\r\n        return `${tokenType} ${this.getIdToken()}`;\r\n    };\r\n\r\n    public getTokenType = (): string => {\r\n        return this.getToken() ? this.getToken().tokenType : undefined;\r\n    };\r\n\r\n    public getTokenExpirationTime = (): number => {\r\n        const tokenRenewalOffsetSeconds = 30;\r\n        const expireOffset = this.config.expireOffsetSeconds + tokenRenewalOffsetSeconds;\r\n\r\n        return (this.tokenData.expiresAt - this.getTimeNow() - expireOffset);\r\n    };\r\n\r\n    public removeToken = (): OAuthTokenData => {\r\n        return this.tokenData = null;\r\n    };\r\n\r\n    public isTokenValid = (): boolean => {\r\n        const token = this.getToken();\r\n\r\n        if (!token) {\r\n            return false;\r\n        }\r\n\r\n        const timeNow = this.getTimeNow();\r\n        const expiresAt = token.expiresAt;\r\n        const isValid = (expiresAt && (expiresAt > timeNow + this.config.expireOffsetSeconds));\r\n\r\n        return isValid;\r\n    };\r\n\r\n    private getTimeNow = (): number => {\r\n        return Math.round(new Date().getTime() / 1000.0);\r\n    };\r\n}"]} diff --git a/dist/es6/url-hash-service.js b/dist/es6/url-hash-service.js index ad854f9..55e9f90 100644 --- a/dist/es6/url-hash-service.js +++ b/dist/es6/url-hash-service.js @@ -8,8 +8,8 @@ System.register([], function (exports_1, context_1) { UrlHashService = (function () { function UrlHashService() { var _this = this; - this.getHash = function () { - var hash = window.location.hash; + this.getHash = function (hashValue) { + var hash = hashValue ? hashValue : window.location.hash; if (hash.indexOf('#/') > -1) { hash = hash.substring(hash.indexOf('#/') + 2); } @@ -18,8 +18,8 @@ System.register([], function (exports_1, context_1) { } return hash; }; - this.getHashData = function () { - var hash = _this.getHash(); + this.getHashData = function (hashValue) { + var hash = _this.getHash(hashValue); var searchRegex = /([^&=]+)=?([^&]*)/g; var hashData = {}; var match = searchRegex.exec(hash); @@ -45,4 +45,4 @@ System.register([], function (exports_1, context_1) { }; }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy91cmwtaGFzaC1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7WUFBQTtnQkFBQTtvQkFBQSxpQkFxQ0M7b0JBcENVLFlBQU8sR0FBRzt3QkFDYixJQUFJLElBQUksR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQzt3QkFFaEMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7NEJBQzFCLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7d0JBQ2xELENBQUM7d0JBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDOzRCQUNoQyxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQzt3QkFDN0IsQ0FBQzt3QkFFRCxNQUFNLENBQUMsSUFBSSxDQUFDO29CQUNoQixDQUFDLENBQUM7b0JBRUssZ0JBQVcsR0FBRzt3QkFDakIsSUFBTSxJQUFJLEdBQUcsS0FBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO3dCQUM1QixJQUFNLFdBQVcsR0FBRyxvQkFBb0IsQ0FBQzt3QkFDekMsSUFBTSxRQUFRLEdBQUcsRUFBRSxDQUFDO3dCQUVwQixJQUFJLEtBQUssR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO3dCQUNuQyxPQUFPLEtBQUssRUFBRSxDQUFDOzRCQUNYLElBQU0sU0FBUyxHQUFHLEtBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7NEJBQy9DLElBQU0sS0FBSyxHQUFHLEtBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7NEJBRTNDLFFBQVEsQ0FBQyxTQUFTLENBQUMsR0FBRyxLQUFLLENBQUM7NEJBQzVCLEtBQUssR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO3dCQUNuQyxDQUFDO3dCQUVELE1BQU0sQ0FBQyxRQUFRLENBQUM7b0JBQ3BCLENBQUMsQ0FBQztvQkFFSyxjQUFTLEdBQUc7d0JBQ2YsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDO29CQUM5QixDQUFDLENBQUM7b0JBRU0sa0JBQWEsR0FBRyxVQUFDLENBQVM7d0JBQzlCLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNyRCxDQUFDLENBQUM7Z0JBQ04sQ0FBQztnQkFBRCxxQkFBQztZQUFELENBckNBLEFBcUNDLElBQUE7O1FBQUEsQ0FBQyIsImZpbGUiOiJ1cmwtaGFzaC1zZXJ2aWNlLmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGRlZmF1bHQgY2xhc3MgVXJsSGFzaFNlcnZpY2Uge1xyXG4gICAgcHVibGljIGdldEhhc2ggPSAoKTogc3RyaW5nID0+IHtcclxuICAgICAgICBsZXQgaGFzaCA9IHdpbmRvdy5sb2NhdGlvbi5oYXNoO1xyXG5cclxuICAgICAgICBpZiAoaGFzaC5pbmRleE9mKCcjLycpID4gLTEpIHtcclxuICAgICAgICAgICAgaGFzaCA9IGhhc2guc3Vic3RyaW5nKGhhc2guaW5kZXhPZignIy8nKSArIDIpO1xyXG4gICAgICAgIH0gZWxzZSBpZiAoaGFzaC5pbmRleE9mKCcjJykgPiAtMSkge1xyXG4gICAgICAgICAgICBoYXNoID0gaGFzaC5zdWJzdHJpbmcoMSk7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICByZXR1cm4gaGFzaDtcclxuICAgIH07XHJcblxyXG4gICAgcHVibGljIGdldEhhc2hEYXRhID0gKCk6IGFueSA9PiB7XHJcbiAgICAgICAgY29uc3QgaGFzaCA9IHRoaXMuZ2V0SGFzaCgpO1xyXG4gICAgICAgIGNvbnN0IHNlYXJjaFJlZ2V4ID0gLyhbXiY9XSspPT8oW14mXSopL2c7XHJcbiAgICAgICAgY29uc3QgaGFzaERhdGEgPSB7fTtcclxuXHJcbiAgICAgICAgbGV0IG1hdGNoID0gc2VhcmNoUmVnZXguZXhlYyhoYXNoKTtcclxuICAgICAgICB3aGlsZSAobWF0Y2gpIHtcclxuICAgICAgICAgICAgY29uc3QgcGFyYW1ldGVyID0gdGhpcy5kZWNvZGVVcmxEYXRhKG1hdGNoWzFdKTtcclxuICAgICAgICAgICAgY29uc3QgdmFsdWUgPSB0aGlzLmRlY29kZVVybERhdGEobWF0Y2hbMl0pO1xyXG5cclxuICAgICAgICAgICAgaGFzaERhdGFbcGFyYW1ldGVyXSA9IHZhbHVlO1xyXG4gICAgICAgICAgICBtYXRjaCA9IHNlYXJjaFJlZ2V4LmV4ZWMoaGFzaCk7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICByZXR1cm4gaGFzaERhdGE7XHJcbiAgICB9O1xyXG5cclxuICAgIHB1YmxpYyBjbGVhckhhc2ggPSAoKTogdm9pZCA9PiB7XHJcbiAgICAgICAgd2luZG93LmxvY2F0aW9uLmhhc2ggPSAnJztcclxuICAgIH07XHJcblxyXG4gICAgcHJpdmF0ZSBkZWNvZGVVcmxEYXRhID0gKHM6IHN0cmluZyk6IHN0cmluZyA9PiB7XHJcbiAgICAgICAgcmV0dXJuIGRlY29kZVVSSUNvbXBvbmVudChzLnJlcGxhY2UoL1xcKy9nLCAnICcpKTtcclxuICAgIH07XHJcbn0iXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy91cmwtaGFzaC1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7WUFBQTtnQkFBQTtvQkFBQSxpQkFxQ0M7b0JBcENVLFlBQU8sR0FBRyxVQUFDLFNBQWtCO3dCQUNoQyxJQUFJLElBQUksR0FBRyxTQUFTLEdBQUcsU0FBUyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDO3dCQUV4RCxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzs0QkFDMUIsSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQzt3QkFDbEQsQ0FBQzt3QkFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7NEJBQ2hDLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUM3QixDQUFDO3dCQUVELE1BQU0sQ0FBQyxJQUFJLENBQUM7b0JBQ2hCLENBQUMsQ0FBQztvQkFFSyxnQkFBVyxHQUFHLFVBQUMsU0FBa0I7d0JBQ3BDLElBQU0sSUFBSSxHQUFHLEtBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7d0JBQ3JDLElBQU0sV0FBVyxHQUFHLG9CQUFvQixDQUFDO3dCQUN6QyxJQUFNLFFBQVEsR0FBRyxFQUFFLENBQUM7d0JBRXBCLElBQUksS0FBSyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7d0JBQ25DLE9BQU8sS0FBSyxFQUFFLENBQUM7NEJBQ1gsSUFBTSxTQUFTLEdBQUcsS0FBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzs0QkFDL0MsSUFBTSxLQUFLLEdBQUcsS0FBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzs0QkFFM0MsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEtBQUssQ0FBQzs0QkFDNUIsS0FBSyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7d0JBQ25DLENBQUM7d0JBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQztvQkFDcEIsQ0FBQyxDQUFDO29CQUVLLGNBQVMsR0FBRzt3QkFDZixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7b0JBQzlCLENBQUMsQ0FBQztvQkFFTSxrQkFBYSxHQUFHLFVBQUMsQ0FBUzt3QkFDOUIsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ3JELENBQUMsQ0FBQztnQkFDTixDQUFDO2dCQUFELHFCQUFDO1lBQUQsQ0FyQ0EsQUFxQ0MsSUFBQTs7UUFBQSxDQUFDIiwiZmlsZSI6InVybC1oYXNoLXNlcnZpY2UuanMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZGVmYXVsdCBjbGFzcyBVcmxIYXNoU2VydmljZSB7XHJcbiAgICBwdWJsaWMgZ2V0SGFzaCA9IChoYXNoVmFsdWU/OiBzdHJpbmcpOiBzdHJpbmcgPT4ge1xyXG4gICAgICAgIGxldCBoYXNoID0gaGFzaFZhbHVlID8gaGFzaFZhbHVlIDogd2luZG93LmxvY2F0aW9uLmhhc2g7XHJcblxyXG4gICAgICAgIGlmIChoYXNoLmluZGV4T2YoJyMvJykgPiAtMSkge1xyXG4gICAgICAgICAgICBoYXNoID0gaGFzaC5zdWJzdHJpbmcoaGFzaC5pbmRleE9mKCcjLycpICsgMik7XHJcbiAgICAgICAgfSBlbHNlIGlmIChoYXNoLmluZGV4T2YoJyMnKSA+IC0xKSB7XHJcbiAgICAgICAgICAgIGhhc2ggPSBoYXNoLnN1YnN0cmluZygxKTtcclxuICAgICAgICB9XHJcblxyXG4gICAgICAgIHJldHVybiBoYXNoO1xyXG4gICAgfTtcclxuXHJcbiAgICBwdWJsaWMgZ2V0SGFzaERhdGEgPSAoaGFzaFZhbHVlPzogc3RyaW5nKTogYW55ID0+IHtcclxuICAgICAgICBjb25zdCBoYXNoID0gdGhpcy5nZXRIYXNoKGhhc2hWYWx1ZSk7XHJcbiAgICAgICAgY29uc3Qgc2VhcmNoUmVnZXggPSAvKFteJj1dKyk9PyhbXiZdKikvZztcclxuICAgICAgICBjb25zdCBoYXNoRGF0YSA9IHt9O1xyXG5cclxuICAgICAgICBsZXQgbWF0Y2ggPSBzZWFyY2hSZWdleC5leGVjKGhhc2gpO1xyXG4gICAgICAgIHdoaWxlIChtYXRjaCkge1xyXG4gICAgICAgICAgICBjb25zdCBwYXJhbWV0ZXIgPSB0aGlzLmRlY29kZVVybERhdGEobWF0Y2hbMV0pO1xyXG4gICAgICAgICAgICBjb25zdCB2YWx1ZSA9IHRoaXMuZGVjb2RlVXJsRGF0YShtYXRjaFsyXSk7XHJcblxyXG4gICAgICAgICAgICBoYXNoRGF0YVtwYXJhbWV0ZXJdID0gdmFsdWU7XHJcbiAgICAgICAgICAgIG1hdGNoID0gc2VhcmNoUmVnZXguZXhlYyhoYXNoKTtcclxuICAgICAgICB9XHJcblxyXG4gICAgICAgIHJldHVybiBoYXNoRGF0YTtcclxuICAgIH07XHJcblxyXG4gICAgcHVibGljIGNsZWFySGFzaCA9ICgpOiB2b2lkID0+IHtcclxuICAgICAgICB3aW5kb3cubG9jYXRpb24uaGFzaCA9ICcnO1xyXG4gICAgfTtcclxuXHJcbiAgICBwcml2YXRlIGRlY29kZVVybERhdGEgPSAoczogc3RyaW5nKTogc3RyaW5nID0+IHtcclxuICAgICAgICByZXR1cm4gZGVjb2RlVVJJQ29tcG9uZW50KHMucmVwbGFjZSgvXFwrL2csICcgJykpO1xyXG4gICAgfTtcclxufSJdfQ== diff --git a/dist/system/oauth-service.js b/dist/system/oauth-service.js index e82055f..0c1a687 100644 --- a/dist/system/oauth-service.js +++ b/dist/system/oauth-service.js @@ -67,18 +67,7 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ return _this.oAuthTokenService.getToken(); }; this.login = function () { - var redirectUrl = _this.config.loginUrl + "?" + - ("response_type=" + _this.oAuthTokenService.config.name + "&") + - ("client_id=" + encodeURIComponent(_this.config.clientId) + "&") + - ("redirect_uri=" + encodeURIComponent(_this.config.redirectUri) + "&") + - ("nonce=" + encodeURIComponent(_this.getSimpleNonceValue())); - if (_this.config.scope) { - redirectUrl += "&scope=" + encodeURIComponent(_this.config.scope); - } - if (_this.config.state) { - redirectUrl += "&state=" + encodeURIComponent(_this.config.state); - } - window.location.href = redirectUrl; + window.location.href = _this.getRedirectUrl(); }; this.logout = function () { var redirectUrl = _this.config.logoutUrl + "?" + @@ -113,6 +102,9 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ window.location.href = _this.getBaseRouteUrl(); } _this.eventAggregator.publish(OAuthService_1.LOGIN_SUCCESS_EVENT, tokenData); + if (_this.config.autoTokenRenewal) { + _this.setAutomaticTokenRenewal(); + } } }; this.isLoginRequired = function (state) { @@ -120,8 +112,8 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ var routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false; return routeHasConfig ? routeRequiresLogin : _this.config.alwaysRequireLogin; }; - this.getTokenDataFromUrl = function () { - var hashData = _this.urlHashService.getHashData(); + this.getTokenDataFromUrl = function (hash) { + var hashData = _this.urlHashService.getHashData(hash); var tokenData = _this.oAuthTokenService.createToken(hashData); return tokenData; }; @@ -138,7 +130,8 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ logoutRedirectParameterName: 'post_logout_redirect_uri', scope: null, state: null, - alwaysRequireLogin: false + alwaysRequireLogin: false, + autoTokenRenewal: true }; } Object.defineProperty(OAuthService, "LOGIN_SUCCESS_EVENT", { @@ -151,6 +144,44 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ enumerable: true, configurable: true }); + OAuthService.prototype.getRedirectUrl = function () { + var redirectUrl = this.config.loginUrl + "?" + + ("response_type=" + this.oAuthTokenService.config.name + "&") + + ("client_id=" + encodeURIComponent(this.config.clientId) + "&") + + ("redirect_uri=" + encodeURIComponent(this.config.redirectUri) + "&") + + ("nonce=" + encodeURIComponent(this.getSimpleNonceValue())); + if (this.config.scope) { + redirectUrl += "&scope=" + encodeURIComponent(this.config.scope); + } + if (this.config.state) { + redirectUrl += "&state=" + encodeURIComponent(this.config.state); + } + return redirectUrl; + }; + OAuthService.prototype.setAutomaticTokenRenewal = function () { + var _this = this; + var tokenExpirationTime = this.oAuthTokenService.getTokenExpirationTime() * 1000; + setTimeout(function () { + var iFrame = document.createElement('iframe'); + iFrame.src = _this.getRedirectUrl(); + iFrame.style.display = 'none'; + iFrame.onload = function (event) { + try { + var hashWithNewToken = iFrame.contentWindow.location.hash; + document.body.removeChild(iFrame); + var tokenData = _this.getTokenDataFromUrl(hashWithNewToken); + if (tokenData) { + _this.oAuthTokenService.setToken(tokenData); + _this.setAutomaticTokenRenewal(); + } + } + catch (ex) { + document.body.removeChild(iFrame); + } + }; + document.body.appendChild(iFrame); + }, tokenExpirationTime); + }; return OAuthService; }()); OAuthService = OAuthService_1 = __decorate([ @@ -165,4 +196,4 @@ System.register(["aurelia-event-aggregator", "aurelia-dependency-injection", "./ }; }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAQM,2BAA2B,GAAW,iBAAiB,CAAC;YAcjD,YAAY;gBASrB,sBACY,iBAAoC,EACpC,cAA8B,EAC9B,mBAAwC,EACxC,eAAgC;oBAJ5C,iBAeC;oBAdW,sBAAiB,GAAjB,iBAAiB,CAAmB;oBACpC,mBAAc,GAAd,cAAc,CAAgB;oBAC9B,wBAAmB,GAAnB,mBAAmB,CAAqB;oBACxC,oBAAe,GAAf,eAAe,CAAiB;oBAarC,cAAS,GAAG,UAAC,MAAmB;wBACnC,EAAE,CAAC,CAAC,KAAI,CAAC,MAAM,CAAC,CAAC,CAAC;4BACd,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;wBACzD,CAAC;wBAGD,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;4BACrC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;wBACnD,CAAC;wBAED,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;4BACtC,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;wBACrD,CAAC;wBAGD,KAAI,CAAC,MAAM,GAAG,8BAAY,CAAC,KAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;wBAGlD,IAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;wBAC1C,IAAI,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;wBAGvC,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;4BACf,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;wBACxD,CAAC;wBAED,EAAE,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;4BACjC,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;wBAC3C,CAAC;wBAED,KAAI,CAAC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,WAAW,CAAC;wBAE5D,MAAM,CAAC,MAAM,CAAC;oBAClB,CAAC,CAAC;oBAEK,oBAAe,GAAG;wBACrB,MAAM,CAAM,KAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;oBAClD,CAAC,CAAC;oBAEK,UAAK,GAAG;wBACX,IAAI,WAAW,GAAM,KAAI,CAAC,MAAM,CAAC,QAAQ,MAAG;6BACxC,mBAAiB,KAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,MAAG,CAAA;6BACtD,eAAa,kBAAkB,CAAC,KAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAG,CAAA;6BACxD,kBAAgB,kBAAkB,CAAC,KAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAG,CAAA;6BAC9D,WAAS,kBAAkB,CAAC,KAAI,CAAC,mBAAmB,EAAE,CAAG,CAAA,CAAC;wBAE9D,EAAE,CAAC,CAAC,KAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;4BACpB,WAAW,IAAI,YAAU,kBAAkB,CAAC,KAAI,CAAC,MAAM,CAAC,KAAK,CAAG,CAAC;wBACrE,CAAC;wBAED,EAAE,CAAC,CAAC,KAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;4BACpB,WAAW,IAAI,YAAU,kBAAkB,CAAC,KAAI,CAAC,MAAM,CAAC,KAAK,CAAG,CAAC;wBACrE,CAAC;wBAED,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,WAAW,CAAC;oBACvC,CAAC,CAAC;oBAEK,WAAM,GAAG;wBACZ,IAAM,WAAW,GAAM,KAAI,CAAC,MAAM,CAAC,SAAS,MAAG;6BACxC,KAAI,CAAC,MAAM,CAAC,2BAA2B,SAAI,kBAAkB,CAAC,KAAI,CAAC,MAAM,CAAC,WAAW,CAAG,CAAA,CAAC;wBAEhG,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,WAAW,CAAC;wBACnC,KAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC;oBACzC,CAAC,CAAC;oBAEK,uBAAkB,GAAG,UAAC,OAAO;wBAChC,EAAE,CAAC,CAAC,OAAO,IAAI,KAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,KAAI,CAAC,eAAe,EAAE,IAAI,CAAC,KAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;4BAErG,EAAE,CAAC,CAAC,KAAI,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;gCAChD,IAAI,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;gCAE/B,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;oCACxB,GAAG,GAAG,KAAI,CAAC,eAAe,EAAE,CAAC;gCACjC,CAAC;gCAED,KAAI,CAAC,mBAAmB,CAAC,GAAG,CAAS,2BAA2B,EAAE,GAAG,CAAC,CAAC;4BAC3E,CAAC;4BAED,KAAI,CAAC,KAAK,EAAE,CAAC;4BAEb,MAAM,CAAC,IAAI,CAAC;wBAChB,CAAC;wBAED,MAAM,CAAC,KAAK,CAAC;oBACjB,CAAC,CAAC;oBAEK,uBAAkB,GAAG;wBACxB,IAAM,SAAS,GAAG,KAAI,CAAC,mBAAmB,EAAE,CAAC;wBAE7C,EAAE,CAAC,CAAC,CAAC,KAAI,CAAC,eAAe,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;4BACvC,KAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;4BAE3C,EAAE,CAAC,CAAC,KAAI,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,IAAI,KAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC;gCAC7G,IAAM,SAAS,GAAG,KAAI,CAAC,mBAAmB,CAAC,GAAG,CAAS,2BAA2B,CAAC,CAAC;gCAEpF,KAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;gCAC7D,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC;4BACrC,CAAC;4BAAC,IAAI,CAAC,CAAC;gCAEJ,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,KAAI,CAAC,eAAe,EAAE,CAAC;4BAClD,CAAC;4BAED,KAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAY,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;wBAC9E,CAAC;oBACL,CAAC,CAAC;oBAEM,oBAAe,GAAG,UAAC,KAAK;wBAC5B,IAAM,cAAc,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,KAAK,SAAS,CAAC;wBACnF,IAAM,kBAAkB,GAAG,cAAc,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,GAAG,IAAI,GAAG,KAAK,CAAC;wBAExF,MAAM,CAAC,cAAc,GAAG,kBAAkB,GAAG,KAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;oBAChF,CAAC,CAAC;oBAEM,wBAAmB,GAAG;wBAC1B,IAAM,QAAQ,GAAG,KAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;wBACnD,IAAM,SAAS,GAAG,KAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;wBAE/D,MAAM,CAAC,SAAS,CAAC;oBACrB,CAAC,CAAC;oBAEM,oBAAe,GAAG;wBACtB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC;oBAC1C,CAAC,CAAA;oBAEO,wBAAmB,GAAG;wBAC1B,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBACtF,CAAC,CAAA;oBAzIG,IAAI,CAAC,QAAQ,GAAG;wBACZ,QAAQ,EAAE,IAAI;wBACd,SAAS,EAAE,IAAI;wBACf,QAAQ,EAAE,IAAI;wBACd,2BAA2B,EAAE,0BAA0B;wBACvD,KAAK,EAAE,IAAI;wBACX,KAAK,EAAE,IAAI;wBACX,kBAAkB,EAAE,KAAK;qBAC5B,CAAC;gBACN,CAAC;gBAlBD,sBAAkB,mCAAmB;yBAArC,cAAkD,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;;;mBAAA;gBAChF,sBAAkB,mCAAmB;yBAArC,cAAkD,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;;;mBAAA;gBAkJpF,mBAAC;YAAD,CAzJA,AAyJC,IAAA;YAzJY,YAAY;gBADxB,yCAAU,EAAE;iDAWsB,uCAAiB;oBACpB,0BAAc;oBACT,+BAAmB;oBACvB,0CAAe;eAbnC,YAAY,CAyJxB;;QAAA,CAAC","file":"oauth-service.js","sourcesContent":["import { EventAggregator } from 'aurelia-event-aggregator';\r\nimport { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport { OAuthTokenService, OAuthTokenData } from './oauth-token-service';\r\nimport UrlHashService from './url-hash-service';\r\nimport LocalStorageService from './local-storage-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nconst OAUTH_STARTPAGE_STORAGE_KEY: string = 'oauth.startPage';\r\n\r\nexport interface OAuthConfig {\r\n    loginUrl: string;\r\n    logoutUrl: string;\r\n    clientId: string;\r\n    logoutRedirectParameterName?: string;\r\n    scope?: string;\r\n    state?: string;\r\n    redirectUri?: string;\r\n    alwaysRequireLogin?: boolean;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthService {\r\n\r\n    public config: OAuthConfig;\r\n\r\n    private defaults: OAuthConfig;\r\n\r\n    public static get LOGIN_SUCCESS_EVENT(): string { return 'oauth:loginSuccess'; }\r\n    public static get INVALID_TOKEN_EVENT(): string { return 'oauth:invalidToken'; }\r\n\r\n    constructor(\r\n        private oAuthTokenService: OAuthTokenService,\r\n        private urlHashService: UrlHashService,\r\n        private localStorageService: LocalStorageService,\r\n        private eventAggregator: EventAggregator) {\r\n\r\n        this.defaults = {\r\n            loginUrl: null,\r\n            logoutUrl: null,\r\n            clientId: null,\r\n            logoutRedirectParameterName: 'post_logout_redirect_uri',\r\n            scope: null,\r\n            state: null,\r\n            alwaysRequireLogin: false\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthConfig): OAuthConfig => {\r\n        if (this.config) {\r\n            throw new Error('OAuthProvider already configured.');\r\n        }\r\n\r\n        // Remove trailing slash from urls.\r\n        if (config.loginUrl.substr(-1) === '/') {\r\n            config.loginUrl = config.loginUrl.slice(0, -1);\r\n        }\r\n\r\n        if (config.logoutUrl.substr(-1) === '/') {\r\n            config.logoutUrl = config.logoutUrl.slice(0, -1);\r\n        }\r\n\r\n        // Extend default configuration.\r\n        this.config = objectAssign(this.defaults, config);\r\n\r\n        // Redirect is set to current location by default\r\n        const existingHash = window.location.hash;\r\n        let pathDefault = window.location.href;\r\n\r\n        // Remove not needed parts from urls.\r\n        if (existingHash) {\r\n            pathDefault = pathDefault.replace(existingHash, '');\r\n        }\r\n\r\n        if (pathDefault.substr(-1) === '#') {\r\n            pathDefault = pathDefault.slice(0, -1);\r\n        }\r\n\r\n        this.config.redirectUri = config.redirectUri || pathDefault;\r\n\r\n        return config;\r\n    };\r\n\r\n    public isAuthenticated = (): boolean => {\r\n        return <any>this.oAuthTokenService.getToken();\r\n    };\r\n\r\n    public login = (): void => {\r\n        let redirectUrl = `${this.config.loginUrl}?` +\r\n            `response_type=${this.oAuthTokenService.config.name}&` +\r\n            `client_id=${encodeURIComponent(this.config.clientId)}&` +\r\n            `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` +\r\n            `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`;\r\n\r\n        if (this.config.scope) {\r\n            redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`;\r\n        }\r\n\r\n        if (this.config.state) {\r\n            redirectUrl += `&state=${encodeURIComponent(this.config.state)}`;\r\n        }\r\n\r\n        window.location.href = redirectUrl;\r\n    };\r\n\r\n    public logout = (): void => {\r\n        const redirectUrl = `${this.config.logoutUrl}?` +\r\n            `${this.config.logoutRedirectParameterName}=${encodeURIComponent(this.config.redirectUri)}`;\r\n\r\n        window.location.href = redirectUrl;\r\n        this.oAuthTokenService.removeToken();\r\n    };\r\n\r\n    public loginOnStateChange = (toState): boolean => {\r\n        if (toState && this.isLoginRequired(toState) && !this.isAuthenticated() && !this.getTokenDataFromUrl()) {\r\n\r\n            if (this.localStorageService.isStorageSupported()) {\r\n                let url = window.location.href;\r\n\r\n                if (!window.location.hash) {\r\n                    url = this.getBaseRouteUrl();\r\n                }\r\n\r\n                this.localStorageService.set<string>(OAUTH_STARTPAGE_STORAGE_KEY, url);\r\n            }\r\n\r\n            this.login();\r\n\r\n            return true;\r\n        }\r\n\r\n        return false;\r\n    };\r\n\r\n    public setTokenOnRedirect = (): void => {\r\n        const tokenData = this.getTokenDataFromUrl();\r\n\r\n        if (!this.isAuthenticated() && tokenData) {\r\n            this.oAuthTokenService.setToken(tokenData);\r\n\r\n            if (this.localStorageService.isStorageSupported() && this.localStorageService.get(OAUTH_STARTPAGE_STORAGE_KEY)) {\r\n                const startPage = this.localStorageService.get<string>(OAUTH_STARTPAGE_STORAGE_KEY);\r\n\r\n                this.localStorageService.remove(OAUTH_STARTPAGE_STORAGE_KEY);\r\n                window.location.href = startPage;\r\n            } else {\r\n                // Redirect to the base application route\r\n                window.location.href = this.getBaseRouteUrl();\r\n            }\r\n\r\n            this.eventAggregator.publish(OAuthService.LOGIN_SUCCESS_EVENT, tokenData);\r\n        }\r\n    };\r\n\r\n    private isLoginRequired = (state): boolean => {\r\n        const routeHasConfig = state.settings && state.settings.requireLogin !== undefined;\r\n        const routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false;\r\n\r\n        return routeHasConfig ? routeRequiresLogin : this.config.alwaysRequireLogin;\r\n    };\r\n\r\n    private getTokenDataFromUrl = (): OAuthTokenData => {\r\n        const hashData = this.urlHashService.getHashData();\r\n        const tokenData = this.oAuthTokenService.createToken(hashData);\r\n\r\n        return tokenData;\r\n    };\r\n\r\n    private getBaseRouteUrl = (): string => {\r\n        return window.location.origin + '/#/';\r\n    }\r\n\r\n    private getSimpleNonceValue = (): string => {\r\n        return ((Date.now() + Math.random()) * Math.random()).toString().replace('.', '');\r\n    }\r\n}"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-service.ts"],"names":[],"mappings":"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","file":"oauth-service.js","sourcesContent":["import { EventAggregator } from 'aurelia-event-aggregator';\r\nimport { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport { OAuthTokenService, OAuthTokenData } from './oauth-token-service';\r\nimport UrlHashService from './url-hash-service';\r\nimport LocalStorageService from './local-storage-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nconst OAUTH_STARTPAGE_STORAGE_KEY: string = 'oauth.startPage';\r\n\r\nexport interface OAuthConfig {\r\n    loginUrl: string;\r\n    logoutUrl: string;\r\n    clientId: string;\r\n    logoutRedirectParameterName?: string;\r\n    scope?: string;\r\n    state?: string;\r\n    redirectUri?: string;\r\n    alwaysRequireLogin?: boolean;\r\n    autoTokenRenewal?: boolean;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthService {\r\n\r\n    public config: OAuthConfig;\r\n\r\n    private defaults: OAuthConfig;\r\n\r\n    public static get LOGIN_SUCCESS_EVENT(): string { return 'oauth:loginSuccess'; }\r\n    public static get INVALID_TOKEN_EVENT(): string { return 'oauth:invalidToken'; }\r\n\r\n    constructor(\r\n        private oAuthTokenService: OAuthTokenService,\r\n        private urlHashService: UrlHashService,\r\n        private localStorageService: LocalStorageService,\r\n        private eventAggregator: EventAggregator) {\r\n\r\n        this.defaults = {\r\n            loginUrl: null,\r\n            logoutUrl: null,\r\n            clientId: null,\r\n            logoutRedirectParameterName: 'post_logout_redirect_uri',\r\n            scope: null,\r\n            state: null,\r\n            alwaysRequireLogin: false,\r\n            autoTokenRenewal: true\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthConfig): OAuthConfig => {\r\n        if (this.config) {\r\n            throw new Error('OAuthProvider already configured.');\r\n        }\r\n\r\n        // Remove trailing slash from urls.\r\n        if (config.loginUrl.substr(-1) === '/') {\r\n            config.loginUrl = config.loginUrl.slice(0, -1);\r\n        }\r\n\r\n        if (config.logoutUrl.substr(-1) === '/') {\r\n            config.logoutUrl = config.logoutUrl.slice(0, -1);\r\n        }\r\n\r\n        // Extend default configuration.\r\n        this.config = objectAssign(this.defaults, config);\r\n\r\n        // Redirect is set to current location by default\r\n        const existingHash = window.location.hash;\r\n        let pathDefault = window.location.href;\r\n\r\n        // Remove not needed parts from urls.\r\n        if (existingHash) {\r\n            pathDefault = pathDefault.replace(existingHash, '');\r\n        }\r\n\r\n        if (pathDefault.substr(-1) === '#') {\r\n            pathDefault = pathDefault.slice(0, -1);\r\n        }\r\n\r\n        this.config.redirectUri = config.redirectUri || pathDefault;\r\n\r\n        return config;\r\n    };\r\n\r\n    public isAuthenticated = (): boolean => {\r\n        return <any>this.oAuthTokenService.getToken();\r\n    };\r\n\r\n    public login = (): void => {\r\n        window.location.href = this.getRedirectUrl();\r\n    };\r\n\r\n    public logout = (): void => {\r\n        const redirectUrl = `${this.config.logoutUrl}?` +\r\n            `${this.config.logoutRedirectParameterName}=${encodeURIComponent(this.config.redirectUri)}`;\r\n\r\n        window.location.href = redirectUrl;\r\n        this.oAuthTokenService.removeToken();\r\n    };\r\n\r\n    public loginOnStateChange = (toState): boolean => {\r\n        if (toState && this.isLoginRequired(toState) && !this.isAuthenticated() && !this.getTokenDataFromUrl()) {\r\n\r\n            if (this.localStorageService.isStorageSupported()) {\r\n                let url = window.location.href;\r\n\r\n                if (!window.location.hash) {\r\n                    url = this.getBaseRouteUrl();\r\n                }\r\n\r\n                this.localStorageService.set<string>(OAUTH_STARTPAGE_STORAGE_KEY, url);\r\n            }\r\n\r\n            this.login();\r\n\r\n            return true;\r\n        }\r\n\r\n        return false;\r\n    };\r\n\r\n    public setTokenOnRedirect = (): void => {\r\n        const tokenData = this.getTokenDataFromUrl();\r\n\r\n        if (!this.isAuthenticated() && tokenData) {\r\n            this.oAuthTokenService.setToken(tokenData);\r\n\r\n            if (this.localStorageService.isStorageSupported() && this.localStorageService.get(OAUTH_STARTPAGE_STORAGE_KEY)) {\r\n                const startPage = this.localStorageService.get<string>(OAUTH_STARTPAGE_STORAGE_KEY);\r\n\r\n                this.localStorageService.remove(OAUTH_STARTPAGE_STORAGE_KEY);\r\n                window.location.href = startPage;\r\n            } else {\r\n                // Redirect to the base application route\r\n                window.location.href = this.getBaseRouteUrl();\r\n            }\r\n\r\n            this.eventAggregator.publish(OAuthService.LOGIN_SUCCESS_EVENT, tokenData);\r\n\r\n            if (this.config.autoTokenRenewal) {\r\n                this.setAutomaticTokenRenewal();\r\n            }\r\n        }\r\n    };\r\n\r\n    private isLoginRequired = (state): boolean => {\r\n        const routeHasConfig = state.settings && state.settings.requireLogin !== undefined;\r\n        const routeRequiresLogin = routeHasConfig && state.settings.requireLogin ? true : false;\r\n\r\n        return routeHasConfig ? routeRequiresLogin : this.config.alwaysRequireLogin;\r\n    };\r\n\r\n    private getTokenDataFromUrl = (hash?: string): OAuthTokenData => {\r\n        const hashData = this.urlHashService.getHashData(hash);\r\n        const tokenData = this.oAuthTokenService.createToken(hashData);\r\n\r\n        return tokenData;\r\n    };\r\n\r\n    private getBaseRouteUrl = (): string => {\r\n        return window.location.origin + '/#/';\r\n    }\r\n\r\n    private getSimpleNonceValue = (): string => {\r\n        return ((Date.now() + Math.random()) * Math.random()).toString().replace('.', '');\r\n    }\r\n\r\n    private getRedirectUrl() {\r\n        let redirectUrl = `${this.config.loginUrl}?` +\r\n            `response_type=${this.oAuthTokenService.config.name}&` +\r\n            `client_id=${encodeURIComponent(this.config.clientId)}&` +\r\n            `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` +\r\n            `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`;\r\n\r\n        if (this.config.scope) {\r\n            redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`;\r\n        }\r\n\r\n        if (this.config.state) {\r\n            redirectUrl += `&state=${encodeURIComponent(this.config.state)}`;\r\n        }\r\n\r\n        return redirectUrl;\r\n    }\r\n\r\n    private setAutomaticTokenRenewal() {\r\n        const tokenExpirationTime = this.oAuthTokenService.getTokenExpirationTime() * 1000;\r\n\r\n        setTimeout(() => {\r\n            const iFrame = document.createElement('iframe');\r\n            iFrame.src = this.getRedirectUrl();\r\n            iFrame.style.display = 'none';\r\n            iFrame.onload = (event) => {\r\n                try {\r\n                    const hashWithNewToken = iFrame.contentWindow.location.hash;\r\n                    document.body.removeChild(iFrame);\r\n\r\n                    const tokenData = this.getTokenDataFromUrl(hashWithNewToken);\r\n\r\n                    if (tokenData) {\r\n                        this.oAuthTokenService.setToken(tokenData);\r\n                        this.setAutomaticTokenRenewal();\r\n                    }\r\n                } catch (ex) {\r\n                    // iFrame.contentWindow can fail when an iframe loads identity server login page\r\n                    // but this page will not redirect back to the app url waiting for the user to login in\r\n                    // this behaviour my occur i.e. when login page authentication cookies expire\r\n                    document.body.removeChild(iFrame);\r\n                }\r\n            };\r\n\r\n            document.body.appendChild(iFrame);\r\n        }, tokenExpirationTime);\r\n    }\r\n}"]} diff --git a/dist/system/oauth-token-service.js b/dist/system/oauth-token-service.js index e64aeeb..fc18a06 100644 --- a/dist/system/oauth-token-service.js +++ b/dist/system/oauth-token-service.js @@ -70,6 +70,11 @@ System.register(["aurelia-dependency-injection", "./jwt-token-service", "./oauth this.getTokenType = function () { return _this.getToken() ? _this.getToken().tokenType : undefined; }; + this.getTokenExpirationTime = function () { + var tokenRenewalOffsetSeconds = 30; + var expireOffset = _this.config.expireOffsetSeconds + tokenRenewalOffsetSeconds; + return (_this.tokenData.expiresAt - _this.getTimeNow() - expireOffset); + }; this.removeToken = function () { return _this.tokenData = null; }; @@ -92,7 +97,7 @@ System.register(["aurelia-dependency-injection", "./jwt-token-service", "./oauth idToken: 'id_token', tokenType: 'token_type' }, - expireOffsetSeconds: 120 + expireOffsetSeconds: 60 }; } return OAuthTokenService; @@ -106,4 +111,4 @@ System.register(["aurelia-dependency-injection", "./jwt-token-service", "./oauth }; }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-token-service.ts"],"names":[],"mappings":"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","file":"oauth-token-service.js","sourcesContent":["import { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport JwtTokenService, { JwtClaims } from './jwt-token-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nexport interface OAuthTokenConfig {\r\n    name: string;\r\n    urlTokenParameters?: {\r\n        idToken: string;\r\n        tokenType?: string;\r\n    };\r\n    expireOffsetSeconds?: number;\r\n}\r\n\r\nexport interface OAuthTokenData {\r\n    token: string;\r\n    tokenType: string;\r\n    expiresAt: number;\r\n    jwtClaims?: JwtClaims;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthTokenService {\r\n\r\n    public config: OAuthTokenConfig;\r\n\r\n    private tokenData: OAuthTokenData;\r\n\r\n    constructor(private jwtTokenService: JwtTokenService) {\r\n        this.config = {\r\n            name: 'id_token',\r\n            urlTokenParameters: {\r\n                idToken: 'id_token',\r\n                tokenType: 'token_type'\r\n            },\r\n            expireOffsetSeconds: 120\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthTokenConfig): OAuthTokenConfig => {\r\n\r\n        // Extend default configration with supplied config data\r\n        if (config.urlTokenParameters) {\r\n            config.urlTokenParameters = objectAssign(this.config.urlTokenParameters, config.urlTokenParameters);\r\n        }\r\n\r\n        this.config = objectAssign(this.config, config);\r\n\r\n        return config;\r\n    };\r\n\r\n    public createToken = (urlTokenData: any): OAuthTokenData => {\r\n        const token = urlTokenData[this.config.urlTokenParameters.idToken];\r\n        const tokenType = urlTokenData[this.config.urlTokenParameters.tokenType] || 'Bearer';\r\n\r\n        if (!token) {\r\n            return null;\r\n        }\r\n\r\n        const claims: JwtClaims = this.jwtTokenService.getJwtClaims(token);\r\n        const issuedTime = claims.nbf ? claims.nbf : claims.iat;\r\n        const expirationTime = claims.exp - issuedTime;\r\n\r\n        return {\r\n            token: token,\r\n            tokenType: tokenType,\r\n            expiresAt: this.getTimeNow() + expirationTime,\r\n            jwtClaims: claims\r\n        };\r\n    };\r\n\r\n    public setToken = (data: OAuthTokenData): OAuthTokenData => {\r\n        return this.tokenData = data;\r\n    };\r\n\r\n    public getToken = (): OAuthTokenData => {\r\n        return this.tokenData;\r\n    };\r\n\r\n    public getIdToken = (): string => {\r\n        return this.getToken() ? this.getToken().token : undefined;\r\n    };\r\n\r\n    public getAuthorizationHeader = (): string => {\r\n        if (!(this.getTokenType() && this.getIdToken())) {\r\n            return '';\r\n        }\r\n\r\n        const tokenType = this.getTokenType().charAt(0).toUpperCase() + this.getTokenType().substr(1);\r\n\r\n        return `${tokenType} ${this.getIdToken()}`;\r\n    };\r\n\r\n    public getTokenType = (): string => {\r\n        return this.getToken() ? this.getToken().tokenType : undefined;\r\n    };\r\n\r\n    public removeToken = (): OAuthTokenData => {\r\n        return this.tokenData = null;\r\n    };\r\n\r\n    public isTokenValid = (): boolean => {\r\n        const token = this.getToken();\r\n\r\n        if (!token) {\r\n            return false;\r\n        }\r\n\r\n        const timeNow = this.getTimeNow();\r\n        const expiresAt = token.expiresAt;\r\n        const isValid = (expiresAt && (expiresAt > timeNow + this.config.expireOffsetSeconds));\r\n\r\n        return isValid;\r\n    };\r\n\r\n    private getTimeNow = (): number => {\r\n        return Math.round(new Date().getTime() / 1000.0);\r\n    };\r\n}"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../src/oauth-token-service.ts"],"names":[],"mappings":"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","file":"oauth-token-service.js","sourcesContent":["import { autoinject } from 'aurelia-dependency-injection';\r\n\r\nimport JwtTokenService, { JwtClaims } from './jwt-token-service';\r\nimport { objectAssign } from './oauth-polyfills';\r\n\r\nexport interface OAuthTokenConfig {\r\n    name: string;\r\n    urlTokenParameters?: {\r\n        idToken: string;\r\n        tokenType?: string;\r\n    };\r\n    expireOffsetSeconds?: number;\r\n}\r\n\r\nexport interface OAuthTokenData {\r\n    token: string;\r\n    tokenType: string;\r\n    expiresAt: number;\r\n    jwtClaims?: JwtClaims;\r\n}\r\n\r\n@autoinject()\r\nexport class OAuthTokenService {\r\n\r\n    public config: OAuthTokenConfig;\r\n\r\n    private tokenData: OAuthTokenData;\r\n\r\n    constructor(private jwtTokenService: JwtTokenService) {\r\n        this.config = {\r\n            name: 'id_token',\r\n            urlTokenParameters: {\r\n                idToken: 'id_token',\r\n                tokenType: 'token_type'\r\n            },\r\n            expireOffsetSeconds: 60\r\n        };\r\n    }\r\n\r\n    public configure = (config: OAuthTokenConfig): OAuthTokenConfig => {\r\n\r\n        // Extend default configration with supplied config data\r\n        if (config.urlTokenParameters) {\r\n            config.urlTokenParameters = objectAssign(this.config.urlTokenParameters, config.urlTokenParameters);\r\n        }\r\n\r\n        this.config = objectAssign(this.config, config);\r\n\r\n        return config;\r\n    };\r\n\r\n    public createToken = (urlTokenData: any): OAuthTokenData => {\r\n        const token = urlTokenData[this.config.urlTokenParameters.idToken];\r\n        const tokenType = urlTokenData[this.config.urlTokenParameters.tokenType] || 'Bearer';\r\n\r\n        if (!token) {\r\n            return null;\r\n        }\r\n\r\n        const claims: JwtClaims = this.jwtTokenService.getJwtClaims(token);\r\n        const issuedTime = claims.nbf ? claims.nbf : claims.iat;\r\n        const expirationTime = claims.exp - issuedTime;\r\n\r\n        return {\r\n            token: token,\r\n            tokenType: tokenType,\r\n            expiresAt: this.getTimeNow() + expirationTime,\r\n            jwtClaims: claims\r\n        };\r\n    };\r\n\r\n    public setToken = (data: OAuthTokenData): OAuthTokenData => {\r\n        return this.tokenData = data;\r\n    };\r\n\r\n    public getToken = (): OAuthTokenData => {\r\n        return this.tokenData;\r\n    };\r\n\r\n    public getIdToken = (): string => {\r\n        return this.getToken() ? this.getToken().token : undefined;\r\n    };\r\n\r\n    public getAuthorizationHeader = (): string => {\r\n        if (!(this.getTokenType() && this.getIdToken())) {\r\n            return '';\r\n        }\r\n\r\n        const tokenType = this.getTokenType().charAt(0).toUpperCase() + this.getTokenType().substr(1);\r\n\r\n        return `${tokenType} ${this.getIdToken()}`;\r\n    };\r\n\r\n    public getTokenType = (): string => {\r\n        return this.getToken() ? this.getToken().tokenType : undefined;\r\n    };\r\n\r\n    public getTokenExpirationTime = (): number => {\r\n        const tokenRenewalOffsetSeconds = 30;\r\n        const expireOffset = this.config.expireOffsetSeconds + tokenRenewalOffsetSeconds;\r\n\r\n        return (this.tokenData.expiresAt - this.getTimeNow() - expireOffset);\r\n    };\r\n\r\n    public removeToken = (): OAuthTokenData => {\r\n        return this.tokenData = null;\r\n    };\r\n\r\n    public isTokenValid = (): boolean => {\r\n        const token = this.getToken();\r\n\r\n        if (!token) {\r\n            return false;\r\n        }\r\n\r\n        const timeNow = this.getTimeNow();\r\n        const expiresAt = token.expiresAt;\r\n        const isValid = (expiresAt && (expiresAt > timeNow + this.config.expireOffsetSeconds));\r\n\r\n        return isValid;\r\n    };\r\n\r\n    private getTimeNow = (): number => {\r\n        return Math.round(new Date().getTime() / 1000.0);\r\n    };\r\n}"]} diff --git a/dist/system/url-hash-service.js b/dist/system/url-hash-service.js index ad854f9..55e9f90 100644 --- a/dist/system/url-hash-service.js +++ b/dist/system/url-hash-service.js @@ -8,8 +8,8 @@ System.register([], function (exports_1, context_1) { UrlHashService = (function () { function UrlHashService() { var _this = this; - this.getHash = function () { - var hash = window.location.hash; + this.getHash = function (hashValue) { + var hash = hashValue ? hashValue : window.location.hash; if (hash.indexOf('#/') > -1) { hash = hash.substring(hash.indexOf('#/') + 2); } @@ -18,8 +18,8 @@ System.register([], function (exports_1, context_1) { } return hash; }; - this.getHashData = function () { - var hash = _this.getHash(); + this.getHashData = function (hashValue) { + var hash = _this.getHash(hashValue); var searchRegex = /([^&=]+)=?([^&]*)/g; var hashData = {}; var match = searchRegex.exec(hash); @@ -45,4 +45,4 @@ System.register([], function (exports_1, context_1) { }; }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy91cmwtaGFzaC1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7WUFBQTtnQkFBQTtvQkFBQSxpQkFxQ0M7b0JBcENVLFlBQU8sR0FBRzt3QkFDYixJQUFJLElBQUksR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQzt3QkFFaEMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7NEJBQzFCLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7d0JBQ2xELENBQUM7d0JBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDOzRCQUNoQyxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQzt3QkFDN0IsQ0FBQzt3QkFFRCxNQUFNLENBQUMsSUFBSSxDQUFDO29CQUNoQixDQUFDLENBQUM7b0JBRUssZ0JBQVcsR0FBRzt3QkFDakIsSUFBTSxJQUFJLEdBQUcsS0FBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO3dCQUM1QixJQUFNLFdBQVcsR0FBRyxvQkFBb0IsQ0FBQzt3QkFDekMsSUFBTSxRQUFRLEdBQUcsRUFBRSxDQUFDO3dCQUVwQixJQUFJLEtBQUssR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO3dCQUNuQyxPQUFPLEtBQUssRUFBRSxDQUFDOzRCQUNYLElBQU0sU0FBUyxHQUFHLEtBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7NEJBQy9DLElBQU0sS0FBSyxHQUFHLEtBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7NEJBRTNDLFFBQVEsQ0FBQyxTQUFTLENBQUMsR0FBRyxLQUFLLENBQUM7NEJBQzVCLEtBQUssR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO3dCQUNuQyxDQUFDO3dCQUVELE1BQU0sQ0FBQyxRQUFRLENBQUM7b0JBQ3BCLENBQUMsQ0FBQztvQkFFSyxjQUFTLEdBQUc7d0JBQ2YsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDO29CQUM5QixDQUFDLENBQUM7b0JBRU0sa0JBQWEsR0FBRyxVQUFDLENBQVM7d0JBQzlCLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNyRCxDQUFDLENBQUM7Z0JBQ04sQ0FBQztnQkFBRCxxQkFBQztZQUFELENBckNBLEFBcUNDLElBQUE7O1FBQUEsQ0FBQyIsImZpbGUiOiJ1cmwtaGFzaC1zZXJ2aWNlLmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGRlZmF1bHQgY2xhc3MgVXJsSGFzaFNlcnZpY2Uge1xyXG4gICAgcHVibGljIGdldEhhc2ggPSAoKTogc3RyaW5nID0+IHtcclxuICAgICAgICBsZXQgaGFzaCA9IHdpbmRvdy5sb2NhdGlvbi5oYXNoO1xyXG5cclxuICAgICAgICBpZiAoaGFzaC5pbmRleE9mKCcjLycpID4gLTEpIHtcclxuICAgICAgICAgICAgaGFzaCA9IGhhc2guc3Vic3RyaW5nKGhhc2guaW5kZXhPZignIy8nKSArIDIpO1xyXG4gICAgICAgIH0gZWxzZSBpZiAoaGFzaC5pbmRleE9mKCcjJykgPiAtMSkge1xyXG4gICAgICAgICAgICBoYXNoID0gaGFzaC5zdWJzdHJpbmcoMSk7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICByZXR1cm4gaGFzaDtcclxuICAgIH07XHJcblxyXG4gICAgcHVibGljIGdldEhhc2hEYXRhID0gKCk6IGFueSA9PiB7XHJcbiAgICAgICAgY29uc3QgaGFzaCA9IHRoaXMuZ2V0SGFzaCgpO1xyXG4gICAgICAgIGNvbnN0IHNlYXJjaFJlZ2V4ID0gLyhbXiY9XSspPT8oW14mXSopL2c7XHJcbiAgICAgICAgY29uc3QgaGFzaERhdGEgPSB7fTtcclxuXHJcbiAgICAgICAgbGV0IG1hdGNoID0gc2VhcmNoUmVnZXguZXhlYyhoYXNoKTtcclxuICAgICAgICB3aGlsZSAobWF0Y2gpIHtcclxuICAgICAgICAgICAgY29uc3QgcGFyYW1ldGVyID0gdGhpcy5kZWNvZGVVcmxEYXRhKG1hdGNoWzFdKTtcclxuICAgICAgICAgICAgY29uc3QgdmFsdWUgPSB0aGlzLmRlY29kZVVybERhdGEobWF0Y2hbMl0pO1xyXG5cclxuICAgICAgICAgICAgaGFzaERhdGFbcGFyYW1ldGVyXSA9IHZhbHVlO1xyXG4gICAgICAgICAgICBtYXRjaCA9IHNlYXJjaFJlZ2V4LmV4ZWMoaGFzaCk7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICByZXR1cm4gaGFzaERhdGE7XHJcbiAgICB9O1xyXG5cclxuICAgIHB1YmxpYyBjbGVhckhhc2ggPSAoKTogdm9pZCA9PiB7XHJcbiAgICAgICAgd2luZG93LmxvY2F0aW9uLmhhc2ggPSAnJztcclxuICAgIH07XHJcblxyXG4gICAgcHJpdmF0ZSBkZWNvZGVVcmxEYXRhID0gKHM6IHN0cmluZyk6IHN0cmluZyA9PiB7XHJcbiAgICAgICAgcmV0dXJuIGRlY29kZVVSSUNvbXBvbmVudChzLnJlcGxhY2UoL1xcKy9nLCAnICcpKTtcclxuICAgIH07XHJcbn0iXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy91cmwtaGFzaC1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7WUFBQTtnQkFBQTtvQkFBQSxpQkFxQ0M7b0JBcENVLFlBQU8sR0FBRyxVQUFDLFNBQWtCO3dCQUNoQyxJQUFJLElBQUksR0FBRyxTQUFTLEdBQUcsU0FBUyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDO3dCQUV4RCxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzs0QkFDMUIsSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQzt3QkFDbEQsQ0FBQzt3QkFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7NEJBQ2hDLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUM3QixDQUFDO3dCQUVELE1BQU0sQ0FBQyxJQUFJLENBQUM7b0JBQ2hCLENBQUMsQ0FBQztvQkFFSyxnQkFBVyxHQUFHLFVBQUMsU0FBa0I7d0JBQ3BDLElBQU0sSUFBSSxHQUFHLEtBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7d0JBQ3JDLElBQU0sV0FBVyxHQUFHLG9CQUFvQixDQUFDO3dCQUN6QyxJQUFNLFFBQVEsR0FBRyxFQUFFLENBQUM7d0JBRXBCLElBQUksS0FBSyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7d0JBQ25DLE9BQU8sS0FBSyxFQUFFLENBQUM7NEJBQ1gsSUFBTSxTQUFTLEdBQUcsS0FBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzs0QkFDL0MsSUFBTSxLQUFLLEdBQUcsS0FBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzs0QkFFM0MsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEtBQUssQ0FBQzs0QkFDNUIsS0FBSyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7d0JBQ25DLENBQUM7d0JBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQztvQkFDcEIsQ0FBQyxDQUFDO29CQUVLLGNBQVMsR0FBRzt3QkFDZixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7b0JBQzlCLENBQUMsQ0FBQztvQkFFTSxrQkFBYSxHQUFHLFVBQUMsQ0FBUzt3QkFDOUIsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ3JELENBQUMsQ0FBQztnQkFDTixDQUFDO2dCQUFELHFCQUFDO1lBQUQsQ0FyQ0EsQUFxQ0MsSUFBQTs7UUFBQSxDQUFDIiwiZmlsZSI6InVybC1oYXNoLXNlcnZpY2UuanMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZGVmYXVsdCBjbGFzcyBVcmxIYXNoU2VydmljZSB7XHJcbiAgICBwdWJsaWMgZ2V0SGFzaCA9IChoYXNoVmFsdWU/OiBzdHJpbmcpOiBzdHJpbmcgPT4ge1xyXG4gICAgICAgIGxldCBoYXNoID0gaGFzaFZhbHVlID8gaGFzaFZhbHVlIDogd2luZG93LmxvY2F0aW9uLmhhc2g7XHJcblxyXG4gICAgICAgIGlmIChoYXNoLmluZGV4T2YoJyMvJykgPiAtMSkge1xyXG4gICAgICAgICAgICBoYXNoID0gaGFzaC5zdWJzdHJpbmcoaGFzaC5pbmRleE9mKCcjLycpICsgMik7XHJcbiAgICAgICAgfSBlbHNlIGlmIChoYXNoLmluZGV4T2YoJyMnKSA+IC0xKSB7XHJcbiAgICAgICAgICAgIGhhc2ggPSBoYXNoLnN1YnN0cmluZygxKTtcclxuICAgICAgICB9XHJcblxyXG4gICAgICAgIHJldHVybiBoYXNoO1xyXG4gICAgfTtcclxuXHJcbiAgICBwdWJsaWMgZ2V0SGFzaERhdGEgPSAoaGFzaFZhbHVlPzogc3RyaW5nKTogYW55ID0+IHtcclxuICAgICAgICBjb25zdCBoYXNoID0gdGhpcy5nZXRIYXNoKGhhc2hWYWx1ZSk7XHJcbiAgICAgICAgY29uc3Qgc2VhcmNoUmVnZXggPSAvKFteJj1dKyk9PyhbXiZdKikvZztcclxuICAgICAgICBjb25zdCBoYXNoRGF0YSA9IHt9O1xyXG5cclxuICAgICAgICBsZXQgbWF0Y2ggPSBzZWFyY2hSZWdleC5leGVjKGhhc2gpO1xyXG4gICAgICAgIHdoaWxlIChtYXRjaCkge1xyXG4gICAgICAgICAgICBjb25zdCBwYXJhbWV0ZXIgPSB0aGlzLmRlY29kZVVybERhdGEobWF0Y2hbMV0pO1xyXG4gICAgICAgICAgICBjb25zdCB2YWx1ZSA9IHRoaXMuZGVjb2RlVXJsRGF0YShtYXRjaFsyXSk7XHJcblxyXG4gICAgICAgICAgICBoYXNoRGF0YVtwYXJhbWV0ZXJdID0gdmFsdWU7XHJcbiAgICAgICAgICAgIG1hdGNoID0gc2VhcmNoUmVnZXguZXhlYyhoYXNoKTtcclxuICAgICAgICB9XHJcblxyXG4gICAgICAgIHJldHVybiBoYXNoRGF0YTtcclxuICAgIH07XHJcblxyXG4gICAgcHVibGljIGNsZWFySGFzaCA9ICgpOiB2b2lkID0+IHtcclxuICAgICAgICB3aW5kb3cubG9jYXRpb24uaGFzaCA9ICcnO1xyXG4gICAgfTtcclxuXHJcbiAgICBwcml2YXRlIGRlY29kZVVybERhdGEgPSAoczogc3RyaW5nKTogc3RyaW5nID0+IHtcclxuICAgICAgICByZXR1cm4gZGVjb2RlVVJJQ29tcG9uZW50KHMucmVwbGFjZSgvXFwrL2csICcgJykpO1xyXG4gICAgfTtcclxufSJdfQ== diff --git a/dist/ts/oauth-service.ts b/dist/ts/oauth-service.ts index b59beb6..332abb6 100644 --- a/dist/ts/oauth-service.ts +++ b/dist/ts/oauth-service.ts @@ -17,6 +17,7 @@ export interface OAuthConfig { state?: string; redirectUri?: string; alwaysRequireLogin?: boolean; + autoTokenRenewal?: boolean; } @autoinject() @@ -42,7 +43,8 @@ export class OAuthService { logoutRedirectParameterName: 'post_logout_redirect_uri', scope: null, state: null, - alwaysRequireLogin: false + alwaysRequireLogin: false, + autoTokenRenewal: true }; } @@ -86,21 +88,7 @@ export class OAuthService { }; public login = (): void => { - let redirectUrl = `${this.config.loginUrl}?` + - `response_type=${this.oAuthTokenService.config.name}&` + - `client_id=${encodeURIComponent(this.config.clientId)}&` + - `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` + - `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`; - - if (this.config.scope) { - redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`; - } - - if (this.config.state) { - redirectUrl += `&state=${encodeURIComponent(this.config.state)}`; - } - - window.location.href = redirectUrl; + window.location.href = this.getRedirectUrl(); }; public logout = (): void => { @@ -149,6 +137,10 @@ export class OAuthService { } this.eventAggregator.publish(OAuthService.LOGIN_SUCCESS_EVENT, tokenData); + + if (this.config.autoTokenRenewal) { + this.setAutomaticTokenRenewal(); + } } }; @@ -159,8 +151,8 @@ export class OAuthService { return routeHasConfig ? routeRequiresLogin : this.config.alwaysRequireLogin; }; - private getTokenDataFromUrl = (): OAuthTokenData => { - const hashData = this.urlHashService.getHashData(); + private getTokenDataFromUrl = (hash?: string): OAuthTokenData => { + const hashData = this.urlHashService.getHashData(hash); const tokenData = this.oAuthTokenService.createToken(hashData); return tokenData; @@ -173,4 +165,52 @@ export class OAuthService { private getSimpleNonceValue = (): string => { return ((Date.now() + Math.random()) * Math.random()).toString().replace('.', ''); } + + private getRedirectUrl() { + let redirectUrl = `${this.config.loginUrl}?` + + `response_type=${this.oAuthTokenService.config.name}&` + + `client_id=${encodeURIComponent(this.config.clientId)}&` + + `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` + + `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`; + + if (this.config.scope) { + redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`; + } + + if (this.config.state) { + redirectUrl += `&state=${encodeURIComponent(this.config.state)}`; + } + + return redirectUrl; + } + + private setAutomaticTokenRenewal() { + const tokenExpirationTime = this.oAuthTokenService.getTokenExpirationTime() * 1000; + + setTimeout(() => { + const iFrame = document.createElement('iframe'); + iFrame.src = this.getRedirectUrl(); + iFrame.style.display = 'none'; + iFrame.onload = (event) => { + try { + const hashWithNewToken = iFrame.contentWindow.location.hash; + document.body.removeChild(iFrame); + + const tokenData = this.getTokenDataFromUrl(hashWithNewToken); + + if (tokenData) { + this.oAuthTokenService.setToken(tokenData); + this.setAutomaticTokenRenewal(); + } + } catch (ex) { + // iFrame.contentWindow can fail when an iframe loads identity server login page + // but this page will not redirect back to the app url waiting for the user to login in + // this behaviour my occur i.e. when login page authentication cookies expire + document.body.removeChild(iFrame); + } + }; + + document.body.appendChild(iFrame); + }, tokenExpirationTime); + } } \ No newline at end of file diff --git a/dist/ts/oauth-token-service.ts b/dist/ts/oauth-token-service.ts index 933d496..6f4cc41 100644 --- a/dist/ts/oauth-token-service.ts +++ b/dist/ts/oauth-token-service.ts @@ -33,7 +33,7 @@ export class OAuthTokenService { idToken: 'id_token', tokenType: 'token_type' }, - expireOffsetSeconds: 120 + expireOffsetSeconds: 60 }; } @@ -95,6 +95,13 @@ export class OAuthTokenService { return this.getToken() ? this.getToken().tokenType : undefined; }; + public getTokenExpirationTime = (): number => { + const tokenRenewalOffsetSeconds = 30; + const expireOffset = this.config.expireOffsetSeconds + tokenRenewalOffsetSeconds; + + return (this.tokenData.expiresAt - this.getTimeNow() - expireOffset); + }; + public removeToken = (): OAuthTokenData => { return this.tokenData = null; }; diff --git a/dist/ts/url-hash-service.ts b/dist/ts/url-hash-service.ts index afb3eba..cff9673 100644 --- a/dist/ts/url-hash-service.ts +++ b/dist/ts/url-hash-service.ts @@ -1,6 +1,6 @@ export default class UrlHashService { - public getHash = (): string => { - let hash = window.location.hash; + public getHash = (hashValue?: string): string => { + let hash = hashValue ? hashValue : window.location.hash; if (hash.indexOf('#/') > -1) { hash = hash.substring(hash.indexOf('#/') + 2); @@ -11,8 +11,8 @@ export default class UrlHashService { return hash; }; - public getHashData = (): any => { - const hash = this.getHash(); + public getHashData = (hashValue?: string): any => { + const hash = this.getHash(hashValue); const searchRegex = /([^&=]+)=?([^&]*)/g; const hashData = {}; diff --git a/package.json b/package.json index 63a48f3..da4eec3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aurelia-oauth", - "version": "0.2.0", + "version": "0.3.0", "description": "Plugin for authentication using OAuth2 and JWT security tokens such as Azure Active Directory or GoogleApi", "keywords": [ "aurelia", diff --git a/src/oauth-service.ts b/src/oauth-service.ts index b59beb6..332abb6 100644 --- a/src/oauth-service.ts +++ b/src/oauth-service.ts @@ -17,6 +17,7 @@ export interface OAuthConfig { state?: string; redirectUri?: string; alwaysRequireLogin?: boolean; + autoTokenRenewal?: boolean; } @autoinject() @@ -42,7 +43,8 @@ export class OAuthService { logoutRedirectParameterName: 'post_logout_redirect_uri', scope: null, state: null, - alwaysRequireLogin: false + alwaysRequireLogin: false, + autoTokenRenewal: true }; } @@ -86,21 +88,7 @@ export class OAuthService { }; public login = (): void => { - let redirectUrl = `${this.config.loginUrl}?` + - `response_type=${this.oAuthTokenService.config.name}&` + - `client_id=${encodeURIComponent(this.config.clientId)}&` + - `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` + - `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`; - - if (this.config.scope) { - redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`; - } - - if (this.config.state) { - redirectUrl += `&state=${encodeURIComponent(this.config.state)}`; - } - - window.location.href = redirectUrl; + window.location.href = this.getRedirectUrl(); }; public logout = (): void => { @@ -149,6 +137,10 @@ export class OAuthService { } this.eventAggregator.publish(OAuthService.LOGIN_SUCCESS_EVENT, tokenData); + + if (this.config.autoTokenRenewal) { + this.setAutomaticTokenRenewal(); + } } }; @@ -159,8 +151,8 @@ export class OAuthService { return routeHasConfig ? routeRequiresLogin : this.config.alwaysRequireLogin; }; - private getTokenDataFromUrl = (): OAuthTokenData => { - const hashData = this.urlHashService.getHashData(); + private getTokenDataFromUrl = (hash?: string): OAuthTokenData => { + const hashData = this.urlHashService.getHashData(hash); const tokenData = this.oAuthTokenService.createToken(hashData); return tokenData; @@ -173,4 +165,52 @@ export class OAuthService { private getSimpleNonceValue = (): string => { return ((Date.now() + Math.random()) * Math.random()).toString().replace('.', ''); } + + private getRedirectUrl() { + let redirectUrl = `${this.config.loginUrl}?` + + `response_type=${this.oAuthTokenService.config.name}&` + + `client_id=${encodeURIComponent(this.config.clientId)}&` + + `redirect_uri=${encodeURIComponent(this.config.redirectUri)}&` + + `nonce=${encodeURIComponent(this.getSimpleNonceValue())}`; + + if (this.config.scope) { + redirectUrl += `&scope=${encodeURIComponent(this.config.scope)}`; + } + + if (this.config.state) { + redirectUrl += `&state=${encodeURIComponent(this.config.state)}`; + } + + return redirectUrl; + } + + private setAutomaticTokenRenewal() { + const tokenExpirationTime = this.oAuthTokenService.getTokenExpirationTime() * 1000; + + setTimeout(() => { + const iFrame = document.createElement('iframe'); + iFrame.src = this.getRedirectUrl(); + iFrame.style.display = 'none'; + iFrame.onload = (event) => { + try { + const hashWithNewToken = iFrame.contentWindow.location.hash; + document.body.removeChild(iFrame); + + const tokenData = this.getTokenDataFromUrl(hashWithNewToken); + + if (tokenData) { + this.oAuthTokenService.setToken(tokenData); + this.setAutomaticTokenRenewal(); + } + } catch (ex) { + // iFrame.contentWindow can fail when an iframe loads identity server login page + // but this page will not redirect back to the app url waiting for the user to login in + // this behaviour my occur i.e. when login page authentication cookies expire + document.body.removeChild(iFrame); + } + }; + + document.body.appendChild(iFrame); + }, tokenExpirationTime); + } } \ No newline at end of file diff --git a/src/oauth-token-service.ts b/src/oauth-token-service.ts index 933d496..6f4cc41 100644 --- a/src/oauth-token-service.ts +++ b/src/oauth-token-service.ts @@ -33,7 +33,7 @@ export class OAuthTokenService { idToken: 'id_token', tokenType: 'token_type' }, - expireOffsetSeconds: 120 + expireOffsetSeconds: 60 }; } @@ -95,6 +95,13 @@ export class OAuthTokenService { return this.getToken() ? this.getToken().tokenType : undefined; }; + public getTokenExpirationTime = (): number => { + const tokenRenewalOffsetSeconds = 30; + const expireOffset = this.config.expireOffsetSeconds + tokenRenewalOffsetSeconds; + + return (this.tokenData.expiresAt - this.getTimeNow() - expireOffset); + }; + public removeToken = (): OAuthTokenData => { return this.tokenData = null; }; diff --git a/src/url-hash-service.ts b/src/url-hash-service.ts index afb3eba..cff9673 100644 --- a/src/url-hash-service.ts +++ b/src/url-hash-service.ts @@ -1,6 +1,6 @@ export default class UrlHashService { - public getHash = (): string => { - let hash = window.location.hash; + public getHash = (hashValue?: string): string => { + let hash = hashValue ? hashValue : window.location.hash; if (hash.indexOf('#/') > -1) { hash = hash.substring(hash.indexOf('#/') + 2); @@ -11,8 +11,8 @@ export default class UrlHashService { return hash; }; - public getHashData = (): any => { - const hash = this.getHash(); + public getHashData = (hashValue?: string): any => { + const hash = this.getHash(hashValue); const searchRegex = /([^&=]+)=?([^&]*)/g; const hashData = {};