Changes to use default config from javascript config file

okta · May 13, 2019 · 2452c19 · 2452c19
1 parent b1a01b7
commit 2452c19
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,6 @@ dist
 npm-debug.log
 .DS_Store
 .vscode
-.samples.config.json
+.samples.config.js
 testenv
 okta-oidc-tck
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -99,4 +99,4 @@ npm test
 node scripts/setup-env.js
 ```
 
-> **NOTE:** If you want to test a different org or client app, you need to delete the configuration file `.samples.config.json`, and start from [first step](#running-e2e-tests-locally)
+> **NOTE:** If you want to test a different org or client app, you need to delete the configuration file `.samples.config.js`, and start from [first step](#running-e2e-tests-locally)
diff --git a/common/sample-web-server.js b/common/sample-web-server.js
@@ -32,7 +32,8 @@ module.exports = function SampleWebServer(sampleConfig, extraOidcOptions, homePa
     client_id: sampleConfig.oidc.clientId,
     client_secret: sampleConfig.oidc.clientSecret,
     appBaseUrl: sampleConfig.oidc.appBaseUrl,
-    scope: sampleConfig.oidc.scope
+    scope: sampleConfig.oidc.scope,
+    testing: sampleConfig.oidc.testing
   }, extraOidcOptions || {}));
 
   const app = express();

diff --git a/custom-login/README.md b/custom-login/README.md
@@ -33,10 +33,10 @@ Now you need to gather the following information from the Okta Developer Console
 
 - **Issuer** - This is the URL of the authorization server that will perform authentication.  All Developer Accounts have a "default" authorization server.  The issuer is a combination of your Org URL (found in the upper right of the console home page) and `/oauth2/default`. For example, `https://dev-1234.okta.com/oauth2/default`.
 
-Now place these values into the file `.samples.config.json` that was created for you in the root of this project:
+Now place these values into the file `.samples.config.js` that was created for you in the root of this project:
 
-```json
-{
+```javascript
+module.exports = {
   "webServer": {
     "port": 8080,
     "oidc": {

diff --git a/custom-login/server.js b/custom-login/server.js
@@ -11,7 +11,7 @@
  */
 
 const url = require('url');
-const sampleConfig = require('../.samples.config.json');
+const sampleConfig = require('../.samples.config.js');
 const SampleWebServer = require('../common/sample-web-server');
 
 const oidcMiddlewareConfig = {

diff --git a/default-config.ts → default-config.js b/default-config.ts → default-config.js
@@ -1,4 +1,4 @@
-export default {
+module.exports = {
     webServer: {
       port: 8080,
       oidc: {

diff --git a/okta-hosted-login/README.md b/okta-hosted-login/README.md
@@ -33,10 +33,10 @@ Now you need to gather the following information from the Okta Developer Console
 
 - **Issuer** - This is the URL of the authorization server that will perform authentication.  All Developer Accounts have a "default" authorization server.  The issuer is a combination of your Org URL (found in the upper right of the console home page) and `/oauth2/default`. For example, `https://dev-1234.okta.com/oauth2/default`.
 
-Now place these values into the file `.samples.config.json` that was created for you in the root of this project:
+Now place these values into the file `.samples.config.js` that was created for you in the root of this project:
 
-```json
-{
+```javascript
+module.exports = {
   "webServer": {
     "port": 8080,
     "oidc": {

diff --git a/okta-hosted-login/server.js b/okta-hosted-login/server.js
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-const sampleConfig = require('../.samples.config.json');
+const sampleConfig = require('../.samples.config.js');
 const SampleWebServer = require('../common/sample-web-server');
 
 /**

diff --git a/resource-server/README.md b/resource-server/README.md
@@ -36,10 +36,10 @@ Now you need to gather the following information from the Okta Developer Console
 - **Client Id** - The client ID of the SPA application that you created earlier. This can be found on the "General" tab of an application, or the list of applications.  The resource server will validate that tokens have been minted for this application.
 - **Issuer** - This is the URL of the authorization server that minted the tokens.  All Developer Accounts have a "default" authorization server.  The issuer is a combination of your Org URL (found in the upper right of the console home page) and `/oauth2/default`. For example, `https://dev-1234.oktapreview.com/oauth2/default`.
 
-Now place these values into the file `.samples.config.json` that was created for you in the root of this project:
+Now place these values into the file `.samples.config.js` that was created for you in the root of this project:
 
-```json
-{
+```javascript
+module.exports = {
   "resourceServer": {
     "port": 8000,
     "oidc": {

diff --git a/resource-server/server.js b/resource-server/server.js
@@ -14,12 +14,13 @@ const express = require('express');
 const OktaJwtVerifier = require('@okta/jwt-verifier');
 var cors = require('cors');
 
-const sampleConfig = require('../.samples.config.json');
+const sampleConfig = require('../.samples.config.js');
 
 const oktaJwtVerifier = new OktaJwtVerifier({
   clientId: sampleConfig.resourceServer.oidc.clientId,
   issuer: sampleConfig.resourceServer.oidc.issuer,
-  assertClaims: sampleConfig.resourceServer.assertClaims
+  assertClaims: sampleConfig.resourceServer.assertClaims,
+  testing: sampleConfig.resourceServer.oidc.testing
 });
 
 /**

diff --git a/scripts/setup-env.js b/scripts/setup-env.js
@@ -13,12 +13,27 @@ function updateConfig() {
     process.exit(1);
   }
 
-  const file = path.join(__dirname, '..', '.samples.config.json');
+  const file = path.join(__dirname, '..', '.samples.config.js');
   const data = fs.readFileSync(file, 'utf8');
-  let result = data.replace(/"cid": "{spaClientId}"/g, `"cid": "${process.env.SPA_CLIENT_ID}"`)
-  result = result.replace(/{clientId}/g, process.env.CLIENT_ID);
-  result = result.replace(/{clientSecret}/g, process.env.CLIENT_SECRET);
-  result = result.replace(/https:\/\/{yourOktaDomain}.com\/oauth2\/default/g, process.env.ISSUER);
+  let result = data.replace(/https:\/\/{yourOktaDomain}.com\/oauth2\/default/g, process.env.ISSUER);
+
+  if(data.indexOf('{clientId}') >= 0){
+    result = result.replace(/{clientId}/g, process.env.CLIENT_ID);
+  }
+
+  if(data.indexOf('{clientSecret}') >= 0){
+    result = result.replace(/{clientSecret}/g, process.env.CLIENT_SECRET);
+  }
+
+  if(data.indexOf('{spaClientId}') >= 0){
+    result = result.replace(/{spaClientId}/g, process.env.SPA_CLIENT_ID);
+  }
+
+  // Only used for testing to support non-https orgs
+  if (process.env.OKTA_TESTING_DISABLEHTTPSCHECK) {
+    result = result.replace(/disableHttpsCheck: false/g, 'disableHttpsCheck: true');
+  }
+
   fs.writeFileSync(file, result, 'utf8');
 }
 

diff --git a/tools/create-config-file.js b/tools/create-config-file.js
@@ -22,9 +22,9 @@ const fs = require('fs');
 const colorsPath = path.join(process.cwd(), 'node_modules', 'colors');
 const colors = require(colorsPath);
 
-const defaultFilePath = path.join(process.cwd(), 'default-config.ts');
+const defaultFilePath = path.join(process.cwd(), 'default-config.js');
 const defaultFile = fs.readFileSync(defaultFilePath);
-const newFilePath = path.join(process.cwd(), '.samples.config.json');
+const newFilePath = path.join(process.cwd(), '.samples.config.js');
 
 /* eslint-disable no-console */