Skip to content

Commit 63999a9

Browse files
committed
1 parent 6228d76 commit 63999a9

File tree

11 files changed

+1154
-159
lines changed

11 files changed

+1154
-159
lines changed

angular-oauth2-oidc/docs/additional-documentation/session-checks.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ <h2 id="configuration">Configuration</h2>
523523
scope: &#39;openid profile email voucher&#39;,
524524

525525
// Activate Session Checks:
526-
sessionChecksEnabled: true
526+
sessionChecksEnabled: true,
527527
}</code></pre><h2 id="events">Events</h2>
528528
<p>To get notified, you can hook up for the event <code>session_terminated</code>:</p>
529529
<pre class="line-numbers"><code class="language-TypeScript">this.oauthService.events.filter(e =&gt; e.type === &#39;session_terminated&#39;).subscribe(e =&gt; {

angular-oauth2-oidc/docs/additional-documentation/using-systemjs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@
505505

506506
<h1 id="using-systemjs">Using SystemJS</h1>
507507
<p>Thanks to <a href="https://github.com/kbeaugrand">Kevin BEAUGRAND</a> for adding this information regarding SystemJS.</p>
508-
<pre class="line-numbers"><code class="language-none">System.config({
508+
<pre class="line-numbers"><code class="language-TypeScript">System.config({
509509
...
510510
meta: {
511511
&#39;angular-oauth2-oidc&#39;: {

angular-oauth2-oidc/docs/classes/AuthConfig.html

Lines changed: 1139 additions & 77 deletions
Large diffs are not rendered by default.

angular-oauth2-oidc/docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ <h2 id="installing">Installing</h2>
673673

674674
&lt;div&gt;
675675
Username/Passwort zum Testen: max/geheim
676-
&lt;/div&gt;</code></pre><h3 id="calling-a-web-api-with-an-oauth-token">Calling a Web API with an OAuth-Token</h3>
676+
&lt;/div&gt;</code></pre><h3 id="calling-a-web-api-with-an-access-token">Calling a Web API with an Access Token</h3>
677677
<p>Pass this Header to the used method of the <code>Http</code>-Service within an Instance of the class <code>Headers</code>:</p>
678678
<pre class="line-numbers"><code class="language-TypeScript">var headers = new Headers({
679679
&quot;Authorization&quot;: &quot;Bearer &quot; + this.oauthService.getAccessToken()

angular-oauth2-oidc/docs/js/search/search_index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

angular-oauth2-oidc/md/session-checks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const authConfig: AuthConfig = {
2525
scope: 'openid profile email voucher',
2626

2727
// Activate Session Checks:
28-
sessionChecksEnabled: true
28+
sessionChecksEnabled: true,
2929
}
3030
```
3131

angular-oauth2-oidc/src/auth.config.ts

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -2,144 +2,98 @@
22
export class AuthConfig {
33
/**
44
* The client's id as registered with the auth server
5-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
65
*/
76
public clientId? = '';
87

98
/**
109
* The client's redirectUri as registered with the auth server
11-
*
12-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
1310
*/
1411
public redirectUri? = '';
1512

1613
/**
1714
* An optional second redirectUri where the auth server
1815
* redirects the user to after logging out.
19-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
2016
*/
2117
public postLogoutRedirectUri? = '';
2218

2319
/**
2420
* The auth server's endpoint that allows to log
2521
* the user in when using implicit flow.
26-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
27-
*
2822
*/
2923
public loginUrl? = '';
3024

3125
/**
3226
* The requested scopes
33-
*
34-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
35-
*
3627
*/
3728
public scope? = 'openid profile';
3829

39-
/**
40-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
41-
*/
4230
public resource? = '';
4331

44-
/**
45-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
46-
*/
4732
public rngUrl? = '';
4833

4934
/**
5035
* Defines whether to use OpenId Connect during
5136
* implicit flow.
52-
*
53-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
5437
*/
5538
public oidc? = true;
5639

5740
/**
5841
* Defines whether to request a access token during
5942
* implicit flow.
60-
*
61-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
6243
*/
6344
public requestAccessToken? = true;
6445

65-
/**
66-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
67-
*/
6846
public options?: any;
6947

7048
/**
7149
* The issuer's uri.
72-
*
73-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
7450
*/
7551
public issuer? = '';
7652

7753
/**
7854
* The logout url.
79-
*
80-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
8155
*/
8256
public logoutUrl? = '';
8357

8458
/**
8559
* Defines whether to clear the hash fragment after logging in.
86-
*
87-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
8860
*/
8961
public clearHashAfterLogin? = true;
9062

9163
/**
9264
* Url of the token endpoint as defined by OpenId Connect and OAuth 2.
93-
*
94-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
9565
*/
9666
public tokenEndpoint?: string;
9767

9868
/**
9969
* Url of the userinfo endpoint as defined by OpenId Connect.
10070
*
101-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
102-
*
10371
*/
10472
public userinfoEndpoint?: string;
10573

106-
/**
107-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
108-
*/
10974
public responseType? = 'token';
11075

11176
/**
11277
* Defines whether additional debug information should
11378
* be shown at the console.
114-
*
115-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
11679
*/
11780
public showDebugInformation? = false;
11881

11982
/**
12083
* The redirect uri used when doing silent refresh.
121-
*
122-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
12384
*/
12485
public silentRefreshRedirectUri? = '';
12586

126-
/**
127-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
128-
*/
12987
public silentRefreshMessagePrefix? = '';
13088

13189
/**
13290
* Set this to true to display the iframe used for
13391
* silent refresh for debugging.
134-
*
135-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
13692
*/
13793
public silentRefreshShowIFrame? = false;
13894

13995
/**
14096
* Timeout for silent refresh.
141-
*
142-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
14397
*/
14498
public siletRefreshTimeout?: number = 1000 * 20;
14599

@@ -150,8 +104,6 @@ export class AuthConfig {
150104
* here. As this passwort is exposed to the public
151105
* it does not bring additional security and is therefore
152106
* as good as using no password.
153-
*
154-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
155107
*/
156108
public dummyClientSecret?: string;
157109

@@ -161,47 +113,34 @@ export class AuthConfig {
161113
* The default value is remoteOnly which only allows
162114
* http for location, while every other domains need
163115
* to be used with https.
164-
*
165-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
166116
*/
167117
public requireHttps?: boolean | 'remoteOnly' = 'remoteOnly';
168118

169119
/**
170120
* Defines whether every url provided by the discovery
171121
* document has to start with the issuer's url.
172-
*
173-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
174122
*/
175123
public strictDiscoveryDocumentValidation? = true;
176124

177125
/**
178126
* JSON Web Key Set (https://tools.ietf.org/html/rfc7517)
179127
* with keys used to validate received id_tokens.
180128
* This is taken out of the disovery document. Can be set manually too.
181-
*
182-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
183129
*/
184130
public jwks?: object;
185131

186132
/**
187133
* Map with additional query parameter that are appended to
188134
* the request when initializing implicit flow.
189-
*
190-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
191135
*/
192136
public customQueryParams?: object;
193137

194-
/**
195-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
196-
*/
197138
public silentRefreshIFrameName? = 'angular-oauth-oidc-silent-refresh-iframe';
198139

199140
/**
200141
* Defines when the token_timeout event should be raised.
201142
* If you set this to the default value 0.75, the event
202143
* is triggered after 75% of the token's life time.
203-
*
204-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
205144
*/
206145
public timeoutFactor? = 0.75;
207146

@@ -210,31 +149,24 @@ export class AuthConfig {
210149
* is still logged in on a regular basis as described
211150
* in http://openid.net/specs/openid-connect-session-1_0.html#ChangeNotification
212151
* @type {boolean}
213-
*
214-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
215152
*/
216153
public sessionChecksEnabled? = false;
217154

218155
/**
219156
* Intervall in msec for checking the session
220157
* according to http://openid.net/specs/openid-connect-session-1_0.html#ChangeNotification
221158
* @type {number}
222-
*
223-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
224159
*/
225160
public sessionCheckIntervall? = 3 * 1000;
226161

227162
/**
228163
* Url for the iframe used for session checks
229-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
230164
*/
231165
public sessionCheckIFrameUrl?: string;
232166

233167
/**
234168
* Name of the iframe to use for session checks
235169
* @type {number}
236-
*
237-
* @internal DEPREACTED/ LEGACY. Use method configure instead.
238170
*/
239171
public sessionCheckIFrameName? = 'angular-oauth-oidc-check-session-iframe';
240172

angular-oauth2-oidc/src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-oauth2-oidc",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/manfredsteyer/angular-oauth2-oidc"

sample/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@angular/platform-browser": "^4.2.4",
2222
"@angular/platform-browser-dynamic": "^4.2.4",
2323
"@angular/router": "^4.2.4",
24-
"angular-oauth2-oidc": "^2.0.15",
24+
"angular-oauth2-oidc": "^2.1.1",
2525
"bootstrap": "^3.3.7",
2626
"core-js": "^2.4.1",
2727
"rxjs": "^5.4.2",

sample/src/app/app.module.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1+
import { authConfig } from './auth.config';
12
import {NgModule} from '@angular/core';
23
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
34
import {HttpModule} from '@angular/http';
45
import {BrowserModule} from '@angular/platform-browser';
5-
import {JwksValidationHandler, OAuthModule, ValidationHandler} from 'angular-oauth2-oidc';
6+
import {AuthConfig, JwksValidationHandler, OAuthModule, ValidationHandler} from 'angular-oauth2-oidc';
67

78
import {AppComponent} from './app.component';
89
import {AppRouterModule} from './app.routes';
910
import {BASE_URL} from './app.tokens';
1011
import {FlightHistoryComponent} from './flight-history/flight-history.component';
1112
import {HomeComponent} from './home/home.component';
13+
import {PasswordFlowLoginComponent} from './password-flow-login/password-flow-login.component';
1214
import {SharedModule} from './shared/shared.module';
13-
import { PasswordFlowLoginComponent } from './password-flow-login/password-flow-login.component';
1415

1516
@NgModule({
1617
imports: [
@@ -26,11 +27,12 @@ import { PasswordFlowLoginComponent } from './password-flow-login/password-flow-
2627
declarations: [
2728
AppComponent,
2829
HomeComponent,
29-
FlightHistoryComponent,
30-
PasswordFlowLoginComponent
30+
FlightHistoryComponent
31+
,
32+
PasswordFlowLoginComponent
3133
],
3234
providers: [
33-
// {provide: AUTH_CONFIG, useValue: authConfig },
35+
// {provide: AuthConfig, useValue: authConfig },
3436
// { provide: OAuthStorage, useClass: DemoStorage },
3537
// { provide: ValidationHandler, useClass: JwksValidationHandler },
3638
{ provide: BASE_URL, useValue: "http://www.angular.at" }

0 commit comments

Comments
 (0)