erge conflicts resolved

Author: manfredsteyer

README.MD

@@ -27,7 +27,7 @@ https://manfredsteyer.github.io/angular-oauth2-oidc/angular-oauth2-oidc/docs/
 
 ## Tested Environment
 
-Successfully tested with Angular 4.3+, Angular 5 and its Router,PathLocationStrategy as well as HashLocationStrategy and CommonJS-Bundling via webpack. At server side we've used IdentityServer (.NET/ .NET Core) and Redhat's Keycloak (Java).
+Successfully tested with Angular 4.3+, Angular 5 and its Router, PathLocationStrategy as well as HashLocationStrategy and CommonJS-Bundling via webpack. At server side we've used IdentityServer (.NET/ .NET Core) and Redhat's Keycloak (Java).
 
 ## Release Cycle
 
@@ -272,8 +272,7 @@ OAuthModule.forRoot({
 
 ## Routing
 
-If you use the ``PathLocationStragegy`` (which is on by default) and have a general catch-all-route (``path: '**'``) you should be fine. Otherwise look up the section ``Routing with the HashStrategy`` in the [documation](https://manfredsteyer.github.io/angular-oauth2-oidc/angular-oauth2-oidc/docs/).
-
+If you use the ``PathLocationStrategy`` (which is on by default) and have a general catch-all-route (``path: '**'``) you should be fine. Otherwise look up the section ``Routing with the HashStrategy`` in the [documentation](https://manfredsteyer.github.io/angular-oauth2-oidc/angular-oauth2-oidc/docs/).
 
 ## More Documentation
 

angular-oauth2-oidc/README.MD

@@ -59,7 +59,7 @@ See [Release Notes](https://github.com/manfredsteyer/angular-oauth2-oidc/release
 - Providing Events via the observable ``events``.
 - The event ``token_expires`` can be used together with a silent refresh to automatically refresh a token when/ before it expires (see also property ``timeoutFactor``).
 
-## Additional Features 
+## Additional Features
 - Logging in via OAuth2 and OpenId Connect (OIDC) Implicit Flow (where user is redirected to Identity Provider)
 - "Logging in" via Password Flow (where user enters his/her password into the client)
 - Token Refresh for Password Flow by using a Refresh Token
@@ -83,7 +83,7 @@ You can use the OIDC-Sample-Server mentioned in the samples for Testing. It assu
 
 Username/Password: max/geheim
 
-*clientIds:* 
+*clientIds:*
 - spa-demo (implicit flow)
 - demo-resource-owner (resource owner password flow)
 
@@ -105,7 +105,7 @@ import { OAuthModule } from 'angular-oauth2-oidc';
 [...]
 
 @NgModule({
-  imports: [ 
+  imports: [
     [...]
     HttpModule,
     OAuthModule.forRoot()
@@ -116,13 +116,13 @@ import { OAuthModule } from 'angular-oauth2-oidc';
     [...]
   ],
   bootstrap: [
-    AppComponent 
+    AppComponent
   ]
 })
 export class AppModule {
 }
 
-``` 
+```
 
 ## Configuring for Implicit Flow
 
@@ -236,9 +236,9 @@ The following snippet contains the template for the login page:
 
 ### Skipping the Login Form
 
-If you don't want to display a login form that tells the user that they are redirected to the identity server, you can use the convenince function ``this.oauthService.loadDiscoveryDocumentAndLogin();`` instead of ``this.oauthService.loadDiscoveryDocumentAndTryLogin();`` when setting up the library. 
+If you don't want to display a login form that tells the user that they are redirected to the identity server, you can use the convenince function ``this.oauthService.loadDiscoveryDocumentAndLogin();`` instead of ``this.oauthService.loadDiscoveryDocumentAndTryLogin();`` when setting up the library.
 
-This directly redirects the user to the identity server if there are no valid tokens. 
+This directly redirects the user to the identity server if there are no valid tokens.
 
 
 ### Calling a Web API with an Access Token

angular-oauth2-oidc/docs/additional-documentation/working-with-httpinterceptors.html

@@ -593,7 +593,7 @@
 
 
 <h1 id="interceptors">Interceptors</h1>
-<p>Since 3.1 the library uses a default HttpInterceptor that takes care about transmitting the access_token to the resource server and about error handling for security related errors (HTTP status codes 401 and 403) received from the resource server. To put in on, just set <code>sendAccessToken</code> to <code>true</code> and set <code>allowedUrls</code> to an array with prefixes for the respective urls. Use lower case for the prefixes:</p>
+<p>Since 3.1 the library uses a default HttpInterceptor that takes care about transmitting the access_token to the resource server and about error handling for security related errors (HTTP status codes 401 and 403) received from the resource server. To enable it, just set <code>sendAccessToken</code> to <code>true</code> and set <code>allowedUrls</code> to an array with prefixes for the respective urls. Use lower case for the prefixes:</p>
 <pre class="line-numbers"><code class="language-TypeScript">OAuthModule.forRoot({
     resourceServer: {
         allowedUrls: [&#39;http://www.angular.at/api&#39;],

angular-oauth2-oidc/gulpfile.js

@@ -1,27 +1,28 @@
 /* eslint-disable */
 var gulp = require('gulp'),
-path = require('path'),
-ngc = require('@angular/compiler-cli/src/main').main,
-rollup = require('gulp-rollup'),
-rename = require('gulp-rename'),
-del = require('del'),
-runSequence = require('run-sequence'),
-inlineResources = require('./tools/gulp/inline-resources');
+    path = require('path'),
+    ngc = require('@angular/compiler-cli/src/main').main,
+    rollup = require('gulp-rollup'),
+    rename = require('gulp-rename'),
+    del = require('del'),
+    runSequence = require('run-sequence'),
+    inlineResources = require('./tools/gulp/inline-resources');
 
 const rootFolder = path.join(__dirname);
 const srcFolder = path.join(rootFolder, 'src');
 const tmpFolder = path.join(rootFolder, '.tmp');
 const buildFolder = path.join(rootFolder, 'build');
 const distFolder = path.join(rootFolder, 'dist');
+const bundlesFolder = path.join(distFolder, 'bundles');
 
 /**
 * 1. Delete /dist folder
 */
 gulp.task('clean:dist', function () {
 
-// Delete contents but not dist folder to avoid broken npm links
-// when dist directory is removed while npm link references it.
-return deleteFolders([distFolder + '/**', '!' + distFolder]);
+    // Delete contents but not dist folder to avoid broken npm links
+    // when dist directory is removed while npm link references it.
+    return deleteFolders([distFolder + '/**', '!' + distFolder]);
 });
 
 /**
@@ -30,17 +31,17 @@ return deleteFolders([distFolder + '/**', '!' + distFolder]);
 *    when copying to /.tmp.
 */
 gulp.task('copy:source', function () {
-return gulp.src([`${srcFolder}/**/*`, `!${srcFolder}/node_modules`])
-  .pipe(gulp.dest(tmpFolder));
+    return gulp.src([`${srcFolder}/**/*`, `!${srcFolder}/node_modules`])
+        .pipe(gulp.dest(tmpFolder));
 });
 
 /**
 * 3. Inline template (.html) and style (.css) files into the the component .ts files.
 *    We do this on the /.tmp folder to avoid editing the original /src files
 */
 gulp.task('inline-resources', function () {
-return Promise.resolve()
-  .then(() => inlineResources(tmpFolder));
+    return Promise.resolve()
+        .then(() => inlineResources(tmpFolder));
 });
 
 
@@ -49,168 +50,112 @@ return Promise.resolve()
 *    compiled modules to the /build folder.
 */
 gulp.task('ngc', function () {
-return ngc({
-  project: `${tmpFolder}/tsconfig.es5.json`
-})
-  .then((exitCode) => {
-    if (exitCode === 1) {
-      // This error is caught in the 'compile' task by the runSequence method callback
-      // so that when ngc fails to compile, the whole compile process stops running
-      throw new Error('ngc compilation failed');
-    }
-  });
+    return ngc([], function (s) {
+        throw new Error(s);
+    })
 });
 
 /**
 * 5. Run rollup inside the /build folder to generate our Flat ES module and place the
 *    generated file into the /dist folder
 */
-gulp.task('rollup:fesm', function () {
-return gulp.src(`${buildFolder}/**/*.js`)
-// transform the files here.
-  .pipe(rollup({
-
-    // Bundle's entry point
-    // See "input" in https://rollupjs.org/#core-functionality
-    input: `${buildFolder}/index.js`,
-
-    // Allow mixing of hypothetical and actual files. "Actual" files can be files
-    // accessed by Rollup or produced by plugins further down the chain.
-    // This prevents errors like: 'path/file' does not exist in the hypothetical file system
-    // when subdirectories are used in the `src` directory.
-    allowRealFiles: true,
-
-    // A list of IDs of modules that should remain external to the bundle
-    // See "external" in https://rollupjs.org/#core-functionality
-    external: [
-      '@angular/core',
-      '@angular/common'
-    ],
-
-    // Format of generated bundle
-    // See "format" in https://rollupjs.org/#core-functionality
-    format: 'es'
-  }))
-  .pipe(gulp.dest(distFolder));
-});
-
-/**
-* 6. Run rollup inside the /build folder to generate our UMD module and place the
-*    generated file into the /dist folder
-*/
 gulp.task('rollup:umd', function () {
-return gulp.src(`${buildFolder}/**/*.js`)
-// transform the files here.
-  .pipe(rollup({
-
-    // Bundle's entry point
-    // See "input" in https://rollupjs.org/#core-functionality
-    input: `${buildFolder}/index.js`,
-
-    // Allow mixing of hypothetical and actual files. "Actual" files can be files
-    // accessed by Rollup or produced by plugins further down the chain.
-    // This prevents errors like: 'path/file' does not exist in the hypothetical file system
-    // when subdirectories are used in the `src` directory.
-    allowRealFiles: true,
-
-    // A list of IDs of modules that should remain external to the bundle
-    // See "external" in https://rollupjs.org/#core-functionality
-    external: [
-      '@angular/core',
-      '@angular/common'
-    ],
-
-    // Format of generated bundle
-    // See "format" in https://rollupjs.org/#core-functionality
-    format: 'umd',
-
-    // Export mode to use
-    // See "exports" in https://rollupjs.org/#danger-zone
-    exports: 'named',
-
-    // The name to use for the module for UMD/IIFE bundles
-    // (required for bundles with exports)
-    // See "name" in https://rollupjs.org/#core-functionality
-    name: 'angular-oauth2-oidc',
-
-    // See "globals" in https://rollupjs.org/#core-functionality
-    globals: {
-      typescript: 'ts'
-    }
-
-  }))
-  .pipe(rename('angular-oauth2-oidc.umd.js'))
-  .pipe(gulp.dest(distFolder));
+    return gulp.src(`${buildFolder}/**/*.js`)
+        // transform the files here.
+        .pipe(rollup({
+
+            // Bundle's entry point
+            // See "input" in https://rollupjs.org/#core-functionality
+            entry: `${buildFolder}/index.js`,
+            // A list of IDs of modules that should remain external to the bundle
+            // See "external" in https://rollupjs.org/#core-functionality
+            external: [
+                '@angular/core',
+                '@angular/common'
+            ],
+            // Format of generated bundle
+            // See "format" in https://rollupjs.org/#core-functionality
+            output: {
+                name: 'UMD',
+                format: 'umd',
+                globals: {
+                    typescript: 'ts'
+                }
+            },
+        }))
+        .pipe(rename('angular-oauth2-oidc.umd.js'))
+        .pipe(gulp.dest(bundlesFolder))
+    ;
 });
 
+
 /**
 * 7. Copy all the files from /build to /dist, except .js files. We ignore all .js from /build
 *    because with don't need individual modules anymore, just the Flat ES module generated
 *    on step 5.
 */
 gulp.task('copy:build', function () {
-return gulp.src([`${buildFolder}/**/*`, `!${buildFolder}/**/*.js`])
-  .pipe(gulp.dest(distFolder));
+    return gulp.src([`${buildFolder}/**/*`])
+        .pipe(gulp.dest(distFolder));
 });
 
 /**
 * 8. Copy package.json from /src to /dist
 */
 gulp.task('copy:manifest', function () {
-return gulp.src([`${srcFolder}/package.json`])
-  .pipe(gulp.dest(distFolder));
+    return gulp.src([`${srcFolder}/package.json`])
+        .pipe(gulp.dest(distFolder));
 });
 
 /**
 * 9. Copy README.md from / to /dist
 */
 gulp.task('copy:readme', function () {
-return gulp.src([path.join(rootFolder, 'README.MD')])
-  .pipe(gulp.dest(distFolder));
+    return gulp.src([path.join(rootFolder, 'README.MD')])
+        .pipe(gulp.dest(distFolder));
 });
 
 /**
 * 10. Delete /.tmp folder
 */
 gulp.task('clean:tmp', function () {
-return deleteFolders([tmpFolder]);
+    return deleteFolders([tmpFolder]);
 });
 
 /**
 * 11. Delete /build folder
 */
 gulp.task('clean:build', function () {
-return deleteFolders([buildFolder]);
+    return deleteFolders([buildFolder]);
 });
 
 gulp.task('compile', function () {
-runSequence(
-  'clean:dist',
-  'copy:source',
-  'inline-resources',
-  'ngc',
-  'rollup:fesm',
-  'rollup:umd',
-  'copy:build',
-  'copy:manifest',
-  'copy:readme',
-  'clean:build',
-  'clean:tmp',
-  function (err) {
-    if (err) {
-      console.log('ERROR:', err.message);
-      deleteFolders([distFolder, tmpFolder, buildFolder]);
-    } else {
-      console.log('Compilation finished succesfully');
-    }
-  });
+    runSequence(
+        'clean:dist',
+        'copy:source',
+        'inline-resources',
+        'ngc',
+        'rollup:umd',
+        'copy:build',
+        'copy:manifest',
+        'copy:readme',
+        'clean:build',
+        'clean:tmp',
+        function (err) {
+            if (err) {
+                console.log('ERROR:', err.message);
+                deleteFolders([distFolder, tmpFolder, buildFolder]);
+            } else {
+                console.log('Compilation finished succesfully');
+            }
+        });
 });
 
 /**
 * Watch for any change in the /src folder and compile files
 */
 gulp.task('watch', function () {
-gulp.watch(`${srcFolder}/**/*`, ['compile']);
+    gulp.watch(`${srcFolder}/**/*`, ['compile']);
 });
 
 gulp.task('clean', ['clean:dist', 'clean:tmp', 'clean:build']);
@@ -223,5 +168,5 @@ gulp.task('default', ['build:watch']);
 * Deletes the specified folder
 */
 function deleteFolders(folders) {
-return del(folders);
+    return del(folders);
 }

angular-oauth2-oidc/index.ts

@@ -0,0 +1,13 @@
+export * from './src/angular-oauth-oidic.module';
+export * from './src/oauth-service';
+export * from './src/token-validation/jwks-validation-handler';
+export * from './src/token-validation/null-validation-handler';
+export * from './src/token-validation/validation-handler';
+export * from './src/url-helper.service';
+export * from './src/auth.config';
+export * from './src/types';
+export * from './src/tokens';
+export * from './src/events';
+export * from './src/interceptors/default-oauth.interceptor';
+export * from './src/interceptors/resource-server-error-handler';
+export * from './src/oauth-module.config';