fix: extract address from auth token when sent as input

src/components/core/handler/handler.ts

@@ -161,7 +161,7 @@ export abstract class CommandHandler
       return buildRateLimitReachedResponse()
     }
     // then validate the command arguments
-    const validation = await this.validate(task)
+    const validation = this.validate(task)
     if (!validation.valid) {
       return buildInvalidParametersResponse(validation)
     }
@@ -173,6 +173,15 @@ export abstract class CommandHandler
     }
   }
 
+  async getAddressFromToken(authToken: string): Promise<string> {
+    const auth = this.getOceanNode().getAuth()
+    if (!auth) {
+      throw new Error('Auth not configured')
+    }
+
+    return (await auth.validateToken(authToken)).address
+  }
+
   async validateTokenOrSignature(
     authToken: string,
     address: string,

src/components/core/handler/persistentStorage.ts

@@ -9,6 +9,7 @@ import type {
 } from '../../../@types/commands.js'
 import {
   PersistentStorageAccessDeniedError,
+  PersistentStorageFileInfo,
   type PersistentStorageFactory
 } from '../../persistentStorage/PersistentStorageFactory.js'
 import type { P2PCommandResponse } from '../../../@types/OceanNode.js'
@@ -22,6 +23,7 @@ import {
   type ValidateParams
 } from '../../httpRoutes/validateCommands.js'
 import { CommandHandler } from './handler.js'
+import { PersistentStorageObject } from '../../../@types/PersistentStorage.js'
 
 function requirePersistentStorage(handler: CommandHandler): PersistentStorageFactory {
   const node = handler.getOceanNode() as any
@@ -87,7 +89,12 @@ export class PersistentStorageCreateBucketHandler extends CommandHandler {
 
       let ownerNormalized: string
       try {
-        ownerNormalized = getAddress(task.consumerAddress)
+        if (task.consumerAddress) {
+          ownerNormalized = getAddress(task.consumerAddress)
+        } else {
+          const authTokenAddress = await this.getAddressFromToken(task.authorization)
+          ownerNormalized = getAddress(authTokenAddress)
+        }
       } catch {
         return {
           stream: null,
@@ -190,7 +197,13 @@ export class PersistentStorageListFilesHandler extends CommandHandler {
 
     try {
       const storage = requirePersistentStorage(this)
-      const result = await storage.listFiles(task.bucketId, task.consumerAddress)
+      let result: PersistentStorageFileInfo[]
+      if (task.consumerAddress) {
+        result = await storage.listFiles(task.bucketId, task.consumerAddress)
+      } else {
+        const authTokenAddress = await this.getAddressFromToken(task.authorization)
+        result = await storage.listFiles(task.bucketId, authTokenAddress)
+      }
       return {
         stream: Readable.from(JSON.stringify(result)),
         status: { httpStatus: 200, error: null }
@@ -231,11 +244,17 @@ export class PersistentStorageGetFileObjectHandler extends CommandHandler {
 
     try {
       const storage = requirePersistentStorage(this)
-      const obj = await storage.getFileObject(
-        task.bucketId,
-        task.fileName,
-        task.consumerAddress
-      )
+      let obj: PersistentStorageObject
+      if (task.consumerAddress) {
+        obj = await storage.getFileObject(
+          task.bucketId,
+          task.fileName,
+          task.consumerAddress
+        )
+      } else {
+        const authTokenAddress = await this.getAddressFromToken(task.authorization)
+        obj = await storage.getFileObject(task.bucketId, task.fileName, authTokenAddress)
+      }
       return {
         stream: Readable.from(JSON.stringify(obj)),
         status: { httpStatus: 200, error: null }
@@ -285,12 +304,23 @@ export class PersistentStorageUploadFileHandler extends CommandHandler {
           status: { httpStatus: 403, error: 'Upload stream error' }
         }
       }
-      const result = await storage.uploadFile(
-        task.bucketId,
-        task.fileName,
-        task.stream,
-        task.consumerAddress
-      )
+      let result: PersistentStorageFileInfo
+      if (task.consumerAddress) {
+        result = await storage.uploadFile(
+          task.bucketId,
+          task.fileName,
+          task.stream,
+          task.consumerAddress
+        )
+      } else {
+        const authTokenAddress = await this.getAddressFromToken(task.authorization)
+        result = await storage.uploadFile(
+          task.bucketId,
+          task.fileName,
+          task.stream,
+          authTokenAddress
+        )
+      }
       return {
         stream: Readable.from(JSON.stringify(result)),
         status: { httpStatus: 200, error: null }
@@ -331,7 +361,12 @@ export class PersistentStorageDeleteFileHandler extends CommandHandler {
 
     try {
       const storage = requirePersistentStorage(this)
-      await storage.deleteFile(task.bucketId, task.fileName, task.consumerAddress)
+      if (task.consumerAddress) {
+        await storage.deleteFile(task.bucketId, task.fileName, task.consumerAddress)
+      } else {
+        const authTokenAddress = await this.getAddressFromToken(task.authorization)
+        await storage.deleteFile(task.bucketId, task.fileName, authTokenAddress)
+      }
       return {
         stream: Readable.from(JSON.stringify({ success: true })),
         status: { httpStatus: 200, error: null }