@xyo-network/api 2.21.13 → 2.21.14

package/package.json

@@ -10,11 +10,11 @@
   },
   "dependencies": {
     "@xylabs/sdk-js": "^2.5.9",
-    "@xyo-network/account": "^2.21.13",
-    "@xyo-network/boundwitness": "^2.21.13",
-    "@xyo-network/core": "^2.21.13",
-    "@xyo-network/payload": "^2.21.13",
-    "@xyo-network/typeof": "^2.21.13",
+    "@xyo-network/account": "^2.21.14",
+    "@xyo-network/boundwitness": "^2.21.14",
+    "@xyo-network/core": "^2.21.14",
+    "@xyo-network/payload": "^2.21.14",
+    "@xyo-network/typeof": "^2.21.14",
     "axios": "^0.27.2",
     "pako": "^2.0.4",
     "uuid": "^8.3.2"
@@ -61,6 +61,6 @@
   },
   "sideEffects": true,
   "types": "dist/esm/index.d.ts",
-  "version": "2.21.13",
+  "version": "2.21.14",
   "packageManager": "yarn@3.1.1"
 }

package/src/Archivist/Account/Api.spec.ts

@@ -8,11 +8,8 @@ import { XyoAccountApi } from './Api'
 const timeout = 20000
 const config: XyoApiConfig = {
   apiDomain: process.env.API_DOMAIN || 'http://localhost:8080',
-  jwtToken: process.env.JWT_TOKEN || undefined,
 }
 
-//const describeSkipIfNoToken = config.jwtToken ? describe : describe.skip
-
 describe('XyoAuthApi', () => {
   describe('get', () => {
     it('returns a new XyoWalletApi', () => {

package/src/Archivist/Api.spec.ts

@@ -1,25 +1,18 @@
 import { XyoAccount } from '@xyo-network/account'
 import { XyoBoundWitness, XyoBoundWitnessBuilder } from '@xyo-network/boundwitness'
-import { config } from 'dotenv'
 
 import { XyoApiConfig, XyoApiError } from '../models'
 import { testPayload } from '../Test'
 import { XyoArchivistApi } from './Api'
 import { getNewArchive, getRandomArchiveName } from './ApiUtil.spec'
 
-config()
-
 const configData: XyoApiConfig = {
   apiDomain: process.env.API_DOMAIN || 'https://beta.api.archivist.xyo.network',
-  apiKey: process.env.API_KEY || undefined,
-  jwtToken: process.env.JWT_TOKEN || undefined,
   onError: (error) => console.error(`Error: ${JSON.stringify(error)}`),
   onFailure: (response) => response, //console.error(`Failure: ${response.statusText} [${response.status}] [${JSON.stringify(response.data)}]`),
   onSuccess: (response) => response, //console.log(`Success: ${response.statusText} [${response.status}] [${JSON.stringify(response.data)}]`),
 }
 
-const describeSkipIfNoToken = configData.jwtToken || configData.apiKey ? describe : describe.skip
-
 describe('postBoundWitness', () => {
   it.each([true, false])('posts a single bound witness', async (inlinePayloads) => {
     const builder = new XyoBoundWitnessBuilder({ inlinePayloads }).witness(XyoAccount.random()).payload(testPayload)
@@ -57,7 +50,7 @@ describe('postBoundWitnesses', () => {
   })
 })
 
-describeSkipIfNoToken('XyoArchivistApi', () => {
+describe.skip('XyoArchivistApi', () => {
   describe('get', () => {
     it('returns a new XyoArchivistApi', () => {
       const api = new XyoArchivistApi(configData)

package/src/Archivist/ApiUtil.spec.ts

@@ -1,4 +1,5 @@
 import { Wallet } from '@ethersproject/wallet'
+import { assertEx } from '@xylabs/sdk-js'
 import { XyoAccount } from '@xyo-network/account'
 import { v4 } from 'uuid'
 
@@ -13,7 +14,7 @@ export const getRandomArchiveName = (): string => {
   return `test-archive-${randomString}`
 }
 
-export const getNewArchive = async (api: XyoArchivistApi) => {
+export const getTokenForNewUser = async (api: XyoArchivistApi): Promise<string> => {
   const account = XyoAccount.random()
   const address = new Wallet(account.private.bytes)
   const challenge = await api.account(account.public).challenge.post()
@@ -21,14 +22,17 @@ export const getNewArchive = async (api: XyoArchivistApi) => {
   const message = challenge?.state || ''
   const signature = await address.signMessage(message)
   const verify = await api.account(account.public).verify.post({ message, signature })
-  expect(verify?.token).toBeTruthy()
-  const jwtToken = verify?.token || ''
+  const jwtToken = assertEx(verify?.token, 'Missing JWT token in response')
+  return jwtToken
+}
+
+export const getNewArchive = async (api: XyoArchivistApi) => {
+  const jwtToken = await getTokenForNewUser(api)
   const authenticatedApi = new XyoArchivistApi({ ...api.config, jwtToken })
   const name = getRandomArchiveName()
   const response = await authenticatedApi.archives.archive(name).put()
-  const archive = response?.archive
-  expect(archive).toBeTruthy()
-  return archive || ''
+  const archive = assertEx(response?.archive, 'Missing archive in response')
+  return archive
 }
 
 export const testSchemaPrefix = 'network.xyo.schema.test.'

package/src/Archivist/Payload/Api.spec.ts

@@ -1,13 +1,10 @@
 import { XyoAccount } from '@xyo-network/account'
 import { XyoBoundWitnessBuilder } from '@xyo-network/boundwitness'
-import { config } from 'dotenv'
 
 import { XyoApiConfig, XyoApiError } from '../../models'
 import { XyoArchivistApi } from '../Api'
 import { getNewArchive, getTimestampMinutesFromNow } from '../ApiUtil.spec'
 
-config()
-
 const configData: XyoApiConfig = {
   apiDomain: process.env.API_DOMAIN || 'https://beta.api.archivist.xyo.network',
   onError: (error) => console.error(`Error: ${JSON.stringify(error)}`),

package/src/User/Api.spec.ts

@@ -7,11 +7,8 @@ import { XyoUserApi } from './Api'
 const timeout = 20000
 const config: XyoApiConfig = {
   apiDomain: process.env.API_DOMAIN || 'http://localhost:8080',
-  jwtToken: process.env.JWT_TOKEN || undefined,
 }
 
-const describeSkipIfNoToken = config.jwtToken ? describe : describe.skip
-
 describe('XyoAuthApi', () => {
   describe('get', () => {
     it('returns a new XyoAuthApi', () => {
@@ -19,8 +16,7 @@ describe('XyoAuthApi', () => {
       expect(api).toBeDefined()
     })
   })
-
-  describeSkipIfNoToken('walletChallenge', function () {
+  describe('walletChallenge', function () {
     it(
       'returns a nonce',
       async () => {