Merge pull request #69 from quantnetwork/develop

- upgrading for our new MFA workflow
- upgrading package versions

.eslintrc.json

@@ -0,0 +1,58 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true,
+        "jest": true
+    },
+    "extends": [
+        "airbnb-base",
+        "plugin:import/typescript"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "arrow-parens": "off",
+        "class-methods-use-this": "off",
+        "comma-dangle": "off",
+        "comma-spacing": "off",
+        "consistent-return": "off",
+        "global-require": "off",
+        "import/extensions": "off",
+        "import/newline-after-import": "off",
+        "import/no-dynamic-require": "off",
+        "import/no-named-as-default": "off",
+        "import/no-extraneous-dependencies": "off",
+        "indent": "off",
+        "lines-between-class-members": "off",
+        "max-len": ["error", { "code": 200 }],
+        "new-cap": "off",
+        "no-empty-function": "off",
+        "no-mixed-operators": "off",
+        "no-multi-spaces": "off",
+        "no-multiple-empty-lines": "off",
+        "no-shadow": "off",
+        "no-throw-literal": "off",
+        "no-trailing-spaces": "off",
+        "no-undef": "off",
+        "no-unused-vars": "off",
+        "no-useless-constructor": "off",
+        "object-curly-newline": "off",
+        "object-curly-spacing": "off",
+        "object-property-newline": "off",
+        "object-shorthand": "off",
+        "operator-assignment": "off",
+        "padded-blocks": "off",
+        "prefer-const": "off",
+        "prefer-destructuring": "off",
+        "quotes": "off",
+        "space-before-blocks": "off",
+        "space-infix-ops": "off",
+        "spaced-comment": "off"
+    }
+}

.github/workflows/node.js.yml

@@ -20,7 +20,7 @@ jobs:
       CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
     strategy:
       matrix:
-        node-version: [14.15.0, 16.1.0]
+        node-version: [14.18.0, 16.10.0]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

Makefile

@@ -2,7 +2,7 @@ default:
 	yarn run bootstrap
 
 	cd packages/overledger-types && yarn run build && cd ../..
-	cd packages/overledger-aws-provider && yarn run build && cd ../..
+	cd packages/overledger-oauth-provider && yarn run build && cd ../..
 	cd packages/overledger-provider && yarn run build && cd ../..
 	cd packages/overledger-dlt-abstract && yarn run build && cd ../..
 	cd packages/overledger-core && yarn run build && cd ../..

README.md

@@ -14,7 +14,9 @@ The Overledger SDK is a collection of node packages written in Typescript. Curre
 
 ## Prerequisites
 
-- nodejs v14 >= 14.15.0, or >= v15
+- nodejs v14 >= 14.18.0, or v16 >= 16.10.0
+- yarn
+- lerna
 
 ## Installation
 

api_reference.md

@@ -1,8 +1,6 @@
 ## Modules
 
 <dl>
-<dt><a href="#module_overledger-aws-provider">overledger-aws-provider</a></dt>
-<dd></dd>
 <dt><a href="#module_overledger-bundle">overledger-bundle</a></dt>
 <dd></dd>
 <dt><a href="#module_overledger-core">overledger-core</a></dt>
@@ -17,6 +15,8 @@
 <dd></dd>
 <dt><a href="#module_overledger-dlt-xrp-ledger">overledger-dlt-xrp-ledger</a></dt>
 <dd></dd>
+<dt><a href="#module_overledger-oauth-provider">overledger-oauth-provider</a></dt>
+<dd></dd>
 <dt><a href="#module_overledger-provider">overledger-provider</a></dt>
 <dd></dd>
 <dt><a href="#module_overledger-types">overledger-types</a></dt>
@@ -60,9 +60,6 @@
 </dd>
 </dl>
 
-<a name="module_overledger-aws-provider"></a>
-
-## overledger-aws-provider
 <a name="module_overledger-bundle"></a>
 
 ## overledger-bundle
@@ -237,6 +234,14 @@ Development package for Ripple (XRP Ledger).
 <a name="module_overledger-dlt-xrp-ledger.log"></a>
 
 ### *overledger-dlt-xrp-ledger*.log
+<a name="module_overledger-oauth-provider"></a>
+
+## overledger-oauth-provider
+<a name="module_overledger-oauth-provider.default"></a>
+
+### *overledger-oauth-provider*.default
+Oauth provider package.
+
 <a name="module_overledger-provider"></a>
 
 ## overledger-provider

examples/oauth2/get-tokens-using-client-id-and-secret.js

@@ -23,8 +23,8 @@ const DltNameOptions = require('@quantnetwork/overledger-types').DltNameOptions;
         const refreshTokensResponse = await overledger.getTokensUsingClientIdAndSecret(process.env.USER_NAME, process.env.PASSWORD,
             process.env.CLIENT_ID, process.env.CLIENT_SECRET);
             console.log('accessToken:\n', refreshTokensResponse.accessToken)
-            console.log('refreshToken:\n', refreshTokensResponse.refreshToken);
-            console.log('idToken:\n', refreshTokensResponse.idToken);
+            console.log('expiresIn:\n', refreshTokensResponse.expiresIn);
+            console.log('tokenType:\n', refreshTokensResponse.tokenType);
     } catch (e) {
         console.error('error', e);
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "overledger-sdk-javascript-version2",
   "private": true,
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Quant Network Overledger software development kit (SDK) for the JavaScript (JS) programming language.",
   "scripts": {
     "dev": "nodemon --config nodemon.json --exec yarn run build",
@@ -22,38 +22,40 @@
   "homepage": "https://github.com/quantnetwork/overledger-sdk-javascript-version2#readme",
   "devDependencies": {
     "@npmcli/fs": "^1.0.0",
-    "axios": "^0.21.1",
+    "@typescript-eslint/eslint-plugin": "^5.56.0",
+    "@typescript-eslint/parser": "^5.56.0",
+    "axios": "^1.3.4",
     "dmd-clear": "^0.1.2",
-    "jest": "^27.0.0",
+    "jest": "^29.5.0",
     "jsdoc-to-markdown": "^7.1.1",
     "lerna": "^4.0.0",
     "merge": ">=1.2.1",
     "nodemon": "^2.0.13",
-    "ts-jest": "^27.0.0",
-    "tslint": "^5.16.0",
-    "tslint-config-airbnb": "^5.11.1",
-    "typescript": "^4.5.5"
+    "ts-jest": "^29.0.5",
+    "eslint": "^8.36.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.27.5",
+    "typescript": "^4.9.5"
   },
   "workspaces": [
     "packages/*"
   ],
   "dependencies": {
-    "@quantnetwork/overledger-bundle": "^2.3.0",
-    "@quantnetwork/overledger-dlt-abstract": "^2.3.0",
-    "aws-sdk": "2.1002.0",
+    "@quantnetwork/overledger-bundle": "^2.4.0",
+    "@quantnetwork/overledger-dlt-abstract": "^2.4.0",
     "bitcoinjs-lib": "^5.1.10",
     "coinselect": "^3.1.12",
     "crypto-js": "^4.0.0",
     "csv-writer": "^1.6.0",
     "dotenv": "^8.2.0",
     "jks-js": "^1.0.0",
-    "log4js": "^6.3.0",
+    "log4js": "^6.9.1",
     "msgpackr": "^1.5.5",
     "neat-csv": "^5.2.0",
     "node-fetch": "^2.6.0",
     "node-gyp": "^8.2.0",
     "secure-env": "^1.2.0",
-    "yarn": "^1.22.10"
+    "yarn": "^1.22.19"
   },
   "preinstall": "echo 'engine-strict=true' >> .npmrc"
 }