foobara-typescript-remote-command-generator 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5045b4f54238822deb4764d5ea2f259b482c3350c20e348472b20d30fd1feb83
-  data.tar.gz: 24187f3f79dc8fcd275ff4a8b98010dbac41128b4a6dd92faaf073544746eb7c
+  metadata.gz: 30a3b38f66be2984ac2e6db57d53fe9abf21def7569fc0472938a0166f83934c
+  data.tar.gz: afb81264f3fb218f0e596ad946c77ea509c8fa1e4c99816c2c77e64740892b22
 SHA512:
-  metadata.gz: ae7f0d944f64a64faf54c8cc78f9d0afc53f9c4e857c75efff8993c3132ecefcaa96aec799909444f80dd38b3023db947ab3381a116f298e365b2fb0455432e3
-  data.tar.gz: 8b8b124b10f82ce701b48216f338561b7104d44b45f0793148df2d0545d41947cde9d5b12dd2dea4796c9a5c79005d4f9489ebc6f52cbf68d39cf1698b863b26
+  metadata.gz: 469376f5e5e6f22706a954172b8e60610d1c390b74eb8a3f038c56229459cb292893b8ee6e29caa45b398d96f6fcc81e5165517a88c1f82df415fb94e63b1aaa
+  data.tar.gz: 0dd2303b15e531e72deed4a4d876d1e5e1dbe5d5cdb85f4577ebeb1fcaea0bc0c33be0fede4f5aededbd1c4c965cc07b565a789bad7fd56852ee675994972bac

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.15] - 2025-03-30
+
+- Better error handling in RemoteCommand
+
+## [0.0.14] - 2025-03-30
+
+- Implement Auth domain support in RemoteCommand
+
 ## [0.0.13] - 2025-03-17
 
 - Fix bug incorrectly generating model typescript for detached entities

data/templates/base/RemoteCommand.ts

@@ -1,13 +1,16 @@
 import { type Outcome, SuccessfulOutcome, ErrorOutcome } from './Outcome'
 import { type FoobaraError } from './Error'
 
-export type commandState = 'initialized' | 'executing' | 'succeeded' | 'errored' | 'failed'
+export type commandState = 'initialized' | 'executing' | 'refreshing_auth' | 'succeeded' | 'errored' | 'failed'
+
+const accessTokens: Record<string, string> = {}
 
 export default abstract class RemoteCommand<Inputs, Result, CommandError extends FoobaraError> {
   static _urlBase: string | undefined
   static commandName: string
   static organizationName: string
   static domainName: string
+  static authRequired: boolean = true // TODO: set this from generator
 
   // TODO: make use of domain's config instead of process.env directly.
   static get urlBase (): string {
@@ -73,27 +76,70 @@ export default abstract class RemoteCommand<Inputs, Result, CommandError extends
     return (this.constructor as typeof RemoteCommand<Inputs, Result, CommandError>).fullCommandName
   }
 
+  get commandPath (): string {
+    return this.fullCommandName.replaceAll('::', '/')
+  }
+
   async run (): Promise<Outcome<Result, CommandError>> {
-    const url = `${this.urlBase}/run/${this.fullCommandName}`
+    const url = `${this.urlBase}/run/${this.commandPath}`
 
-    this.commandState = 'executing'
-    const response = await fetch(url, {
+    const bearerToken = accessTokens[this.urlBase]
+
+    const requestParams: RequestInit = {
       method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(this.inputs)
-    })
+      body: JSON.stringify(this.inputs),
+      credentials: 'include'
+    }
+
+    requestParams.headers = { 'Content-Type': 'application/json' }
 
-    const body = await response.json()
+    if (bearerToken != null) {
+      requestParams.headers.Authorization = `Bearer ${bearerToken}`
+    }
+
+    this.commandState = 'executing'
+    let response = await fetch(url, requestParams)
+
+    if ((this.constructor as typeof RemoteCommand<Inputs, Result, CommandError>).authRequired &&
+        response.status === 401) {
+      this.commandState = 'refreshing_auth'
+
+      // TODO: in generator make this conditional
+      const { RefreshLogin } = await import('../Foobara/Auth')
+      // See if we can authenticate using the refresh token
+      const refreshCommand = new RefreshLogin({})
+      const outcome = await refreshCommand.run()
+
+      if (outcome.isSuccess()) {
+        const bearerToken = accessTokens[this.urlBase]
+
+        if (bearerToken != null) {
+          requestParams.headers.Authorization = `Bearer ${bearerToken}`
+        }
+
+        this.commandState = 'executing'
+        response = await fetch(url, requestParams)
+      }
+    }
+
+    const text = await response.text()
+    const body = JSON.parse(text)
 
     if (response.ok) {
+      const accessToken: string | null = response.headers.get('X-Access-Token')
+
+      if (accessToken != null) {
+        accessTokens[this.urlBase] = accessToken
+      }
+
       this.commandState = 'succeeded'
       this.outcome = new SuccessfulOutcome<Result, CommandError>(body)
-    } else if (response.status === 422) {
+    } else if (response.status === 422 || response.status === 401 || response.status === 403) {
       this.commandState = 'errored'
       this.outcome = new ErrorOutcome<Result, CommandError>(body)
     } else {
       this.commandState = 'failed'
-      throw new Error(`not sure how to handle ${await response.text()}`)
+      throw new Error(`not sure how to handle ${text}`)
     }
 
     return this.outcome

metadata

@@ -1,42 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: foobara-typescript-remote-command-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.88
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.88
 - !ruby/object:Gem::Dependency
   name: foobara-files-generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 email:
 - azimux@gmail.com
 executables: []
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Generates remote commands for Typescript from a foobara manifest
 test_files: []