Feature/readsecrets + brief readme

README.md

@@ -18,3 +18,23 @@ If you would prefer to generate the Javsscript SDK locally from the FINBOURNE Op
 - download the latest swagger.json file from https://api.lusid.com/swagger/index.html
 - save it in this directory as lusid.json
 - run `$ docker-compose up && docker-compose rm -f`
+
+# Working with the SDK
+
+The relevant tests are in sdk/test/tutorials
+
+You need to either create a sdk/secrets.json file, or set environment variables, based on your lusid installation. The configurations go into sdk/test/tutorials/clientBuilder.ts
+
+To generate the JS based on TS
+
+```
+$ cd sdk/
+$ npm i
+$ npm run-script build
+```
+
+To run all scripts in sdk/test/tutorials
+
+```
+$ npm test
+```

sdk/client/client.ts

@@ -17,7 +17,7 @@ import {Api} from "../apis";
 
 
 // Set the default path to the secrets file
-const secretsPath = './secrets.json'
+const secretsPath = process.cwd() + '/secrets.json'
 // Set the default amount of seconds before token expiry to call a refresh
 const refreshLimit = 3580
 
@@ -258,7 +258,7 @@ export class Client {
     } else if (source = Source.Secrets) {
       // Try and import the credentials file
       try {
-        var credentials: any = require(this.secretsFilePath)
+        var credentials: any = require(this.secretsFilePath).api
       // If there are any problems throw an error
       } catch (e) {
         throw "File " + this.secretsFilePath + " could not be found/read, ensure that it exists in the client folder"

sdk/test/tutorials/clientBuilder.ts

@@ -1,10 +1,27 @@
 import { Client, Source } from '../../client/client'
 
+/*
+  Read from Environment Variables
+*/
+
+// export var client = new Client(
+//   [Source.Environment, 'FBN_TOKEN_URL'],
+//   [Source.Environment, 'FBN_USERNAME'],
+//   [Source.Environment, 'FBN_PASSWORD'],
+//   [Source.Environment, 'FBN_CLIENT_ID'],
+//   [Source.Environment, 'FBN_CLIENT_SECRET'],
+//   [Source.Environment, 'FBN_LUSID_API_URL'],
+// )
+
+/*
+  Read from secrets.json
+*/
+
 export var client = new Client(
-  [Source.Environment, 'FBN_TOKEN_URL'],
-  [Source.Environment, 'FBN_USERNAME'],
-  [Source.Environment, 'FBN_PASSWORD'],
-  [Source.Environment, 'FBN_CLIENT_ID'],
-  [Source.Environment, 'FBN_CLIENT_SECRET'],
-  [Source.Environment, 'FBN_LUSID_API_URL'],
-)
+  [Source.Secrets, 'tokenUrl'],
+  [Source.Secrets, 'username'],
+  [Source.Secrets, 'password'],
+  [Source.Secrets, 'clientId'],
+  [Source.Secrets, 'clientSecret'],
+  [Source.Secrets, 'apiUrl']
+)