From 56d7c7f6043d87c8095208dcf00c062abbc1cfda Mon Sep 17 00:00:00 2001 From: Roberto Callari <robertocallari89@gmail.com> Date: Mon, 9 Nov 2020 16:07:36 +0100 Subject: [PATCH] fix --- package-lock.json | 29 ++++++++++++++++++--- package.json | 1 + src/app/app.module.ts | 7 ++--- src/app/oauth/services/token.interceptor.ts | 4 +++ 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b3e6218..43519ece 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16974,6 +16974,14 @@ "tough-cookie": "~2.3.0", "tunnel-agent": "^0.6.0", "uuid": "^3.0.0" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } }, "require-directory": { @@ -18161,6 +18169,14 @@ "requires": { "faye-websocket": "^0.10.0", "uuid": "^3.0.1" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } }, "sockjs-client": { @@ -20515,6 +20531,12 @@ "psl": "^1.1.28", "punycode": "^2.1.1" } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true } } }, @@ -20781,10 +20803,9 @@ "dev": true }, "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", - "dev": true + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz", + "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==" }, "v8flags": { "version": "3.0.1", diff --git a/package.json b/package.json index 647883ae..e19e2d02 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "tinymce": "4.5.7", "tslib": "^1.13.0", "typeface-exo": "0.0.22", + "uuid": "^8.3.1", "web-animations-js": "^2.3.2", "zone.js": "^0.10.3" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e4198e76..0d6f36a5 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -29,6 +29,7 @@ import { UserInformationService } from './oauth/services/user-information.servic import { TokenInterceptor } from './oauth/services/token.interceptor'; import { AuthGuard } from './oauth/services/auth.guard'; import { NbOauth2LogoutComponent } from './oauth/nb-oauth2-logout/nb-oauth2-logout.component'; +import { v4 as uuidv4 } from 'uuid'; export function configFactory(http: HttpClient): ConfigLoader { return new ConfigHttpLoader(http, './assets/config.json'); @@ -69,8 +70,8 @@ export function createTranslateLoader(http: HttpClient) { strategies: [ NbOAuth2AuthStrategy.setup({ name: 'idm', - clientId: 'd3f0bbb0-6846-446a-bce4-2755ad9adcd2', - clientSecret: '59625d70-a36b-40e7-a927-314b1346c3bb', + clientId: 'b5d2fe98-3d01-4b93-b54c-acbb60772479', + clientSecret: '15964f9e-b7e3-4816-bb93-548488cfaca5', baseEndpoint: 'http://192.168.99.100:3000/oauth2/', clientAuthMethod: NbOAuth2ClientAuthMethod.BASIC, token: { @@ -78,7 +79,7 @@ export function createTranslateLoader(http: HttpClient) { class: NbAuthOAuth2Token }, authorize: { - state: "asd", + state: uuidv4(), redirectUri: 'http://localhost:4200/auth/callback', }, redirect: { diff --git a/src/app/oauth/services/token.interceptor.ts b/src/app/oauth/services/token.interceptor.ts index 87378f24..5e21432b 100644 --- a/src/app/oauth/services/token.interceptor.ts +++ b/src/app/oauth/services/token.interceptor.ts @@ -19,6 +19,10 @@ export class TokenInterceptor implements HttpInterceptor { return next.handle(req); } + if (req.url.indexOf('/oauth2/token') > -1) { + return next.handle(req); + } + this.auth.getToken().subscribe((x: NbAuthOAuth2Token) => this.token = x); let newHeaders = req.headers; if (this.token.getPayload() != null) { -- GitLab