Merge branch 'support-for-loading-from-json-config'

damienbod · Jul 19, 2017 · 9a004e8 · 9a004e8
2 parents 6e8c357 + 70fd784
commit 9a004e8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## angular-auth-oidc-client Changelog
 
+<a name="2017-07-19"></a>
+### 2017-07-19 version 1.2.2
+* support reading json file configurations
+
 <a name="2017-07-12"></a>
 ### 2017-07-12 version 1.2.1
 * Fix types in storage class

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ or with yarn
 
 or you can add the npm package to your package.json
 ``` javascript
- "angular-auth-oidc-client": "1.2.1"
+ "angular-auth-oidc-client": "1.2.2"
 ```
 
 and type 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-auth-oidc-client",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "description": "An OpenID Connect Implicit Flow client for Angular",
     "main": "./bundles/angular-auth-oidc-client.umd.js",
     "module": "./modules/angular-auth-oidc-client.es5.js",

diff --git a/src/services/oidc.security.service.ts b/src/services/oidc.security.service.ts
@@ -20,7 +20,8 @@ import { JwtKeys } from './jwtkeys';
 export class OidcSecurityService {
 
     @Output() onUserDataLoaded: EventEmitter<any> = new EventEmitter<any>(true);
-
+    @Output() onModuleSetup: EventEmitter<any> = new EventEmitter<any>(true);
+
     checkSessionChanged: boolean;
     isAuthorized: boolean;
 
@@ -79,6 +80,7 @@ export class OidcSecurityService {
             }
         }
 
+		 this.onModuleSetup.emit();
     }
 
     getToken(): any {