Renamed oAuthSettings members

Author: kmacdonaO

README.md

@@ -95,10 +95,10 @@ behavior you need to use the oAuthSettings parameter documented below.
 This setting is used when using OAUTH to authenticate a secure publishing channel or using preview support. Using this will ensure that a valid OAUTH bearer token will
 be available to the application. The setting takes the form of an object with the following fields:  
 {
-   CLIENT_ID: 'xxxxx',  
-   CLIENT_SECRET: 'xxxxx',  
-   CLIENT_SCOPE_URL: 'xxxxx',  
-   IDP_URL: 'https://identity.server.com'  
+   clientId: 'xxxxx',  
+   clientSecret: 'xxxxx',  
+   clientScopeUrl: 'xxxxx',  
+   idpUrl: 'https://identity.server.com'  
 }  
 
 **`staticAssetDownload`** [optional]  

gatsby-node.js

@@ -79,10 +79,10 @@ const AuthManagerToken = require('./src/authManager');
  * <b>oAuthSettings</b> (optional) This parameter defines the connection settings used to
  * connect to an oAuthServer so that the plugin can get an up-to-date and valid bearer token.
  * It takes the form if an object with the following fields:
- *  CLIENT_ID: login id used on OAUTH provider
- *  CLIENT_SECRET: password used on the OAUTH server
- *  CLIENT_SCOPE_URL: scope URL for the request
- *  IDP_URL: URL:  URL used to connect to the OAUTH token provider
+ *  clientId: login id used on OAUTH provider
+ *  clientSecret: password used on the OAUTH server
+ *  clientScopeUrlL: scope URL for the request
+ *  idpUrl: URL:  URL used to connect to the OAUTH token provider
  *
  *
  */
@@ -107,8 +107,8 @@ exports.sourceNodes = async (
 
   // Work around some clumsiness if this setting originally came from a .env file
   let oAuthObj = null;
-  if (oAuthSettings && oAuthSettings.CLIENT_ID && oAuthSettings.CLIENT_SECRET
-    && oAuthSettings.CLIENT_SCOPE_URL && oAuthSettings.IDP_URL) {
+  if (oAuthSettings && oAuthSettings.clientId && oAuthSettings.clientSecret
+    && oAuthSettings.clientScopeUrl && oAuthSettings.idpUrl) {
     oAuthObj = oAuthSettings;
   }
 

package.json

@@ -2,7 +2,7 @@
   "name": "@oracle/gatsby-source-oce",
   "description": "Gatsby source plugin for using Oracle Content Management as a data source",
   "author": "Oracle America, Inc.",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "homepage": "https://github.com/oracle/gatsby-source-oce",
   "repository": {
     "type": "git",

src/authManager.js

@@ -15,15 +15,15 @@ const fetch = require('node-fetch');
 
 exports.AuthManagerToken = async (authStr, authObj) => {
   const getBearerAuth = async (oAuthObject) => {
-    // base64 encode CLIENT_ID:CLIENT_SECRET
-    const authString = `${oAuthObject.CLIENT_ID}:${oAuthObject.CLIENT_SECRET}`;
+    // base64 encode clientId:clientSecret
+    const authString = `${oAuthObject.clientId}:${oAuthObject.clientSecret}`;
     const authValue = (Buffer.from(authString)).toString('base64');
 
-    // URL encode the CLIENT_SCOPE_URL
-    const encodedScopeUrl = encodeURIComponent(oAuthObject.CLIENT_SCOPE_URL);
+    // URL encode the clientScopeUrl
+    const encodedScopeUrl = encodeURIComponent(oAuthObject.clientScopeUrl);
 
     // build the full REST end point URL for getting the access token
-    const restURL = new URL('/oauth2/v1/token', oAuthObject.IDP_URL);
+    const restURL = new URL('/oauth2/v1/token', oAuthObject.idpUrl);
 
     // make a request to the server to get the access token
     const response = await fetch(restURL.toString(), {

src/fetch.js

@@ -36,9 +36,12 @@ exports.all = async (contentServer, channelToken, limit, query, oAuthStr, previe
 
   // const pretty = (o) => JSON.stringify(o, null, 2);
 
+  // Handle preview being a string or a boolean
+  const isPreview = (preview && (preview === true || preview === 'true'));
+
   const fetchItem = async (id) => {
     let item = null;
-    const itemUrl = preview === true ? `${contentServer}/content/preview/api/v1.1/items/${id}?channelToken=${channelToken}&expand=all` : `${contentServer}/content/published/api/v1.1/items/${id}?channelToken=${channelToken}&expand=all`;
+    const itemUrl = isPreview === true ? `${contentServer}/content/preview/api/v1.1/items/${id}?channelToken=${channelToken}&expand=all` : `${contentServer}/content/published/api/v1.1/items/${id}?channelToken=${channelToken}&expand=all`;
 
     try {
       const headers = new Headers({
@@ -74,7 +77,7 @@ exports.all = async (contentServer, channelToken, limit, query, oAuthStr, previe
     const allPublishedItemsUrl = `${contentServer}/content/published/api/v1.1/items?limit=${fetchLimit}&offset=0&totalResults=true&offset=0&channelToken=${channelToken}${fetchQuery}`;
     const allPreviewItemsUrl = `${contentServer}/content/preview/api/v1.1/items?limit=${fetchLimit}&offset=0&totalResults=true&offset=0&channelToken=${channelToken}${fetchQuery}`;
 
-    const allItemsUrl = preview === true ? allPreviewItemsUrl : allPublishedItemsUrl;
+    const allItemsUrl = isPreview === true ? allPreviewItemsUrl : allPublishedItemsUrl;
 
     // Fetch a response from the apiUrl