From 2ae1effe948c35d112f58f12fbf3b4730e3a24e4 Mon Sep 17 00:00:00 2001 From: manueltanzi-okta Date: Tue, 19 Feb 2019 10:21:43 -0800 Subject: [PATCH] feat[okta-angular][okta-react][okta-vue]: Provide tokenManager configuration in framework SDKs (#388) Provide tokenManager configuration in framework SDKs and upgrading configuration-validation. --- packages/okta-angular/package.json | 2 +- .../okta-angular/src/okta/services/okta.service.ts | 9 +++------ packages/okta-react/package.json | 2 +- packages/okta-react/src/Auth.js | 10 +++------- packages/okta-vue/package.json | 2 +- packages/okta-vue/src/Auth.js | 9 +++------ yarn.lock | 5 +++++ 7 files changed, 17 insertions(+), 22 deletions(-) diff --git a/packages/okta-angular/package.json b/packages/okta-angular/package.json index 93b1c6758..0224b9634 100644 --- a/packages/okta-angular/package.json +++ b/packages/okta-angular/package.json @@ -34,7 +34,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@okta/configuration-validation": "^0.1.1", + "@okta/configuration-validation": "^0.3.0", "@okta/okta-auth-js": "^2.0.0" }, "devDependencies": { diff --git a/packages/okta-angular/src/okta/services/okta.service.ts b/packages/okta-angular/src/okta/services/okta.service.ts index 954b70844..ea8a214f3 100644 --- a/packages/okta-angular/src/okta/services/okta.service.ts +++ b/packages/okta-angular/src/okta/services/okta.service.ts @@ -15,7 +15,8 @@ import { Router, NavigationExtras } from '@angular/router'; import { assertIssuer, assertClientId, - assertRedirectUri + assertRedirectUri, + buildConfigObject } from '@okta/configuration-validation'; import { OKTA_CONFIG, OktaConfig } from '../models/okta.config'; @@ -44,11 +45,7 @@ export class OktaAuthService { this.observers = []; - this.oktaAuth = new OktaAuth({ - clientId: auth.clientId, - issuer: auth.issuer, - redirectUri: auth.redirectUri - }); + this.oktaAuth = new OktaAuth(buildConfigObject(auth)); this.oktaAuth.userAgent = `${packageInfo.name}/${packageInfo.version} ${this.oktaAuth.userAgent}`; diff --git a/packages/okta-react/package.json b/packages/okta-react/package.json index b5a6e01d8..e0457a80d 100644 --- a/packages/okta-react/package.json +++ b/packages/okta-react/package.json @@ -36,7 +36,7 @@ }, "homepage": "https://github.com/okta/okta-oidc-js#readme", "dependencies": { - "@okta/configuration-validation": "^0.1.1", + "@okta/configuration-validation": "^0.3.0", "@okta/okta-auth-js": "^2.0.0", "babel-runtime": "^6.26.0", "prop-types": "^15.5.10" diff --git a/packages/okta-react/src/Auth.js b/packages/okta-react/src/Auth.js index b509a3e59..9144c973a 100644 --- a/packages/okta-react/src/Auth.js +++ b/packages/okta-react/src/Auth.js @@ -12,7 +12,8 @@ import { assertIssuer, assertClientId, - assertRedirectUri + assertRedirectUri, + buildConfigObject } from '@okta/configuration-validation'; import OktaAuth from '@okta/okta-auth-js'; @@ -30,12 +31,7 @@ export default class Auth { assertIssuer(config.issuer, testing); assertClientId(config.client_id); assertRedirectUri(config.redirect_uri); - this._oktaAuth = new OktaAuth({ - url: config.issuer.split('/oauth2/')[0], - clientId: config.client_id, - issuer: config.issuer, - redirectUri: config.redirect_uri - }); + this._oktaAuth = new OktaAuth(buildConfigObject(config)); this._oktaAuth.userAgent = `${packageInfo.name}/${packageInfo.version} ${this._oktaAuth.userAgent}`; this._config = config; this._history = config.history; diff --git a/packages/okta-vue/package.json b/packages/okta-vue/package.json index 6d073cf3c..5156f0938 100644 --- a/packages/okta-vue/package.json +++ b/packages/okta-vue/package.json @@ -52,7 +52,7 @@ }, "homepage": "https://github.com/okta/okta-oidc-js#readme", "dependencies": { - "@okta/configuration-validation": "^0.1.1", + "@okta/configuration-validation": "^0.3.0", "@okta/okta-auth-js": "^2.0.0", "cross-env": "^5.1.1", "vue": "^2.5.17", diff --git a/packages/okta-vue/src/Auth.js b/packages/okta-vue/src/Auth.js index f9f921ce2..444f6c9d9 100644 --- a/packages/okta-vue/src/Auth.js +++ b/packages/okta-vue/src/Auth.js @@ -1,7 +1,8 @@ import { assertIssuer, assertClientId, - assertRedirectUri + assertRedirectUri, + buildConfigObject } from '@okta/configuration-validation' import AuthJS from '@okta/okta-auth-js' import packageInfo from './packageInfo' @@ -9,11 +10,7 @@ import ImplicitCallback from './components/ImplicitCallback' function install (Vue, options) { const authConfig = initConfig(options) - const oktaAuth = new AuthJS({ - clientId: authConfig.client_id, - issuer: authConfig.issuer, - redirectUri: authConfig.redirect_uri - }) + const oktaAuth = new AuthJS(buildConfigObject(authConfig)) oktaAuth.userAgent = `${packageInfo.name}/${packageInfo.version} ${oktaAuth.userAgent}` Vue.prototype.$auth = { diff --git a/yarn.lock b/yarn.lock index ec2ef4621..d5bd8a361 100644 --- a/yarn.lock +++ b/yarn.lock @@ -571,6 +571,11 @@ resolved "https://registry.yarnpkg.com/@okta/configuration-validation/-/configuration-validation-0.1.1.tgz#b19ee16b0fc9f01a7406229b25af6265e91ae942" integrity sha512-nXULaL9l6W5eODVgXxvr0wmde3nE6JLSmGBpZ0axPsaLLx3wo/aY5mC1JwWtIF1kyrfzRHEHIPmdUZ+U5xq/CQ== +"@okta/configuration-validation@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@okta/configuration-validation/-/configuration-validation-0.2.0.tgz#8084ef1f2a2a561ad16b32ab6bc61a5587e06568" + integrity sha512-tUyqM68QSXvsWnFQPh4ruG1ZVKNuUuDxiDdA4f64KphKCKx9R1spGQZ/xrPD1fZ0NaM8Dixz7K+mn7qswa9Ytg== + "@okta/okta-auth-js@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@okta/okta-auth-js/-/okta-auth-js-2.0.1.tgz#9d6e636fd3acb1b4fa27d5ff7473a54edf235d36"