foobara-typescript-remote-command-generator 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d21e54189d68b7b93ec70507e3b0fa433a4a8a380fbbd4e1df92031aea3310d2
-  data.tar.gz: a465fae839c9f38e29908ef3145b9d4b4c0d1de4e37d004893e54653ee783c15
+  metadata.gz: f71e4e6218587eee34596a8ce72c35e41e17da8ae5a4740f2a847c5a91a01494
+  data.tar.gz: ea0628600beba45ad19318a586bb870ecfbebf967d53858c7ae1eb39ece3689e
 SHA512:
-  metadata.gz: b4794d89263b06204d56d09a89ac110f5382e1f1d3fdc914e2fc9a2534c8b16dcec608205643f4fcd9c69ef9ec918610e3d803e3eef6663be3356dfd70b1baba
-  data.tar.gz: d4d2cd4b56df9f690e074695b07bda3dd7f5eb0499bf4060c8854225fb233389f75938d65a1a3134c83255988d660c288bdc8785001a2cc79c598b4397a54b00
+  metadata.gz: 8511b40e771e3c6c7f46d073fbae7d71f6c2df95947bc6d4c5bf6be11c6e7c6858b39a9a5d603691ee2cfa769329fde3416787ed1567bc27cd78dc1532408465
+  data.tar.gz: 1df40a88ab89a6e6ee83dd250a6965054069b1e958e7c0919a12b794273b3379e72c13ee585c980c2e4dd06f467cd459f66747440f656d529c5c971e8625f055

data/CHANGELOG.md

@@ -1,6 +1,14 @@
-## [0.0.14] - 2025-03-29
+## [0.0.16] - 2025-03-31
 
-- Send credentials: 'include'
+- Add a bunch of special-case support for Foobara::Auth domain  convenience
+
+## [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
 

data/src/remote_generator/services/auth/access_tokens_generator.rb

@@ -0,0 +1,13 @@
+module Foobara
+  module RemoteGenerator
+    class Services
+      module Auth
+        class AccessTokensGenerator < TypescriptFromManifestBaseGenerator
+          def template_path
+            "Foobara/Auth/utils/accessTokens.ts.erb"
+          end
+        end
+      end
+    end
+  end
+end

data/src/remote_generator/services/auth/login_command_generator.rb

@@ -0,0 +1,17 @@
+module Foobara
+  module RemoteGenerator
+    class Services
+      module Auth
+        class LoginCommandGenerator < TypescriptFromManifestBaseGenerator
+          def template_path
+            "Foobara/Auth/LoginCommand.ts.erb"
+          end
+
+          def dependencies
+            super + [AccessTokensGenerator.new(relevant_manifest)]
+          end
+        end
+      end
+    end
+  end
+end

data/src/remote_generator/services/auth/login_generator.rb

@@ -0,0 +1,17 @@
+module Foobara
+  module RemoteGenerator
+    class Services
+      module Auth
+        class LoginGenerator < CommandGenerator
+          def base_class_path
+            "Foobara/Auth/LoginCommand"
+          end
+
+          def dependencies
+            super + [LoginCommandGenerator.new(relevant_manifest)]
+          end
+        end
+      end
+    end
+  end
+end

data/src/remote_generator/services/auth/logout_command_generator.rb

@@ -0,0 +1,17 @@
+module Foobara
+  module RemoteGenerator
+    class Services
+      module Auth
+        class LogoutCommandGenerator < TypescriptFromManifestBaseGenerator
+          def template_path
+            "Foobara/Auth/LogoutCommand.ts.erb"
+          end
+
+          def dependencies
+            super + [AccessTokensGenerator.new(relevant_manifest)]
+          end
+        end
+      end
+    end
+  end
+end

data/src/remote_generator/services/auth/logout_generator.rb

@@ -0,0 +1,17 @@
+module Foobara
+  module RemoteGenerator
+    class Services
+      module Auth
+        class LogoutGenerator < CommandGenerator
+          def base_class_path
+            "Foobara/Auth/LogoutCommand"
+          end
+
+          def dependencies
+            super + [LogoutCommandGenerator.new(relevant_manifest)]
+          end
+        end
+      end
+    end
+  end
+end

data/src/remote_generator/services/auth/refresh_login_generator.rb

@@ -0,0 +1,17 @@
+module Foobara
+  module RemoteGenerator
+    class Services
+      module Auth
+        class RefreshLoginGenerator < CommandGenerator
+          def base_class_path
+            "Foobara/Auth/LoginCommand"
+          end
+
+          def dependencies
+            super + [LoginCommandGenerator.new(relevant_manifest)]
+          end
+        end
+      end
+    end
+  end
+end

data/src/remote_generator/services/auth/requires_auth_command_generator.rb

@@ -0,0 +1,15 @@
+require_relative "../typescript_from_manifest_base_generator"
+
+module Foobara
+  module RemoteGenerator
+    class Services
+      module Auth
+        class RequiresAuthCommandGenerator < TypescriptFromManifestBaseGenerator
+          def template_path
+            "Foobara/Auth/RequiresAuthCommand.ts.erb"
+          end
+        end
+      end
+    end
+  end
+end

data/src/remote_generator/services/auth/requires_auth_generator.rb

@@ -0,0 +1,19 @@
+require_relative "../command_generator"
+
+module Foobara
+  module RemoteGenerator
+    class Services
+      module Auth
+        class RequiresAuthGenerator < CommandGenerator
+          def base_class_path
+            "Foobara/Auth/RequiresAuthCommand"
+          end
+
+          def dependencies
+            super + [RequiresAuthCommandGenerator.new(relevant_manifest)]
+          end
+        end
+      end
+    end
+  end
+end

data/src/remote_generator/services/command_generator.rb

@@ -35,6 +35,14 @@ module Foobara
         def command_errors_index_generator
           Services::CommandErrorsIndexGenerator.new(command_manifest)
         end
+
+        def base_class_path
+          "base/RemoteCommand"
+        end
+
+        def base_class_name
+          base_class_path.split("/").last
+        end
       end
     end
   end

data/src/remote_generator/services/domain_generator.rb

@@ -24,7 +24,7 @@ module Foobara
 
         def command_generators
           @command_generators ||= domain_manifest.commands.map do |command_manifest|
-            CommandGenerator.new(command_manifest)
+            generator_for(command_manifest)
           end
         end
 

data/src/remote_generator/services/typescript_from_manifest_base_generator.rb

@@ -28,8 +28,23 @@ module Foobara
           def manifest_to_generator_classes(manifest)
             case manifest
             when Manifest::Command
+              generator_classes = case manifest.full_command_name
+                                  when "Foobara::Auth::RefreshLogin"
+                                    Services::Auth::RefreshLoginGenerator
+                                  when "Foobara::Auth::Login"
+                                    Services::Auth::LoginGenerator
+                                  when "Foobara::Auth::Logout"
+                                    Services::Auth::LogoutGenerator
+                                  else
+                                    if manifest.requires_authentication?
+                                      Services::Auth::RequiresAuthGenerator
+                                    else
+                                      Services::CommandGenerator
+                                    end
+                                  end
+
               [
-                Services::CommandGenerator,
+                *generator_classes,
                 Services::CommandInputsGenerator,
                 Services::CommandResultGenerator,
                 Services::CommandErrorsGenerator,
@@ -190,10 +205,12 @@ module Foobara
           type_string = if type_declaration.is_a?(Manifest::Attributes)
                           ts_type = attributes_to_ts_type(type_declaration, association_depth:, dependency_group:)
 
+                          is_empty = type_declaration.attribute_declarations.empty?
+
                           if name
-                            return "interface #{name} #{ts_type}"
+                            return is_empty ? "undefined" : "interface #{name} #{ts_type}"
                           else
-                            ts_type
+                            is_empty ? "undefined" : ts_type
                           end
                         elsif type_declaration.is_a?(Manifest::Array)
                           # TODO: which association_depth do we pass here?

data/templates/Command.ts.erb

@@ -1,10 +1,10 @@
-import RemoteCommand from "<%= path_to_root %>base/RemoteCommand"
+import <%= base_class_name %> from "<%= path_to_root %><%= base_class_path %>"
 
 import Inputs from "./Inputs"
 import Result from "./Result"
 import { Error } from "./Errors"
 
-export class <%= command_name %> extends RemoteCommand<Inputs, Result, Error> {
+export class <%= command_name %> extends <%= base_class_name %><Inputs, Result, Error> {
   static readonly organizationName = "<%= organization_name %>"
   static readonly domainName = "<%= domain_name %>"
   static readonly commandName = "<%= command_name %>"

data/templates/Foobara/Auth/LoginCommand.ts.erb

@@ -0,0 +1,19 @@
+import RemoteCommand from '../../base/RemoteCommand'
+import { type FoobaraError } from '../../base/Error'
+import { type Outcome } from '../../base/Outcome'
+import { handleLogin } from './utils/accessTokens'
+
+export default class LoginCommand<Inputs, Result, Error extends FoobaraError<any>>
+  extends RemoteCommand<Inputs, Result, Error> {
+  async _handleResponse (response: Response): Promise<Outcome<Result, Error>> {
+    if (response.ok) {
+      const accessToken: string | null = response.headers.get('X-Access-Token')
+
+      if (accessToken != null) {
+        handleLogin(this.urlBase, accessToken)
+      }
+    }
+
+    return await super._handleResponse(response)
+  }
+}

data/templates/Foobara/Auth/LogoutCommand.ts.erb

@@ -0,0 +1,18 @@
+import RemoteCommand from '../../base/RemoteCommand'
+import { type FoobaraError } from '../../base/Error'
+import { type Outcome } from '../../base/Outcome'
+import { handleLogout } from './utils/accessTokens'
+
+export default class LogoutCommand<Inputs, Result, Error extends FoobaraError<any>>
+  extends RemoteCommand<Inputs, Result, Error> {
+  async run (): Promise<Outcome<Result, Error>> {
+    const outcome = await super.run()
+
+    if (outcome.isSuccess()) {
+      // Broadcast logout event to all tabs
+      handleLogout(this.urlBase)
+    }
+
+    return outcome
+  }
+}

data/templates/Foobara/Auth/RequiresAuthCommand.ts.erb

@@ -0,0 +1,43 @@
+import RemoteCommand from '../../base/RemoteCommand'
+import { type Outcome } from '../../base/Outcome'
+import { type FoobaraError } from '../../base/Error'
+import { tokenForUrl } from './utils/accessTokens'
+
+export default class RequiresAuthCommand<Inputs, Result, Error extends FoobaraError<any>>
+  extends RemoteCommand<Inputs, Result, Error> {
+  _buildRequestParams (): RequestInit {
+    const requestParams = super._buildRequestParams()
+
+    const bearerToken = tokenForUrl(this.urlBase)
+
+    if (bearerToken != null && requestParams.headers != null) {
+      requestParams.headers = { ...requestParams.headers, Authorization: `Bearer ${bearerToken}` }
+    }
+
+    return requestParams
+  }
+
+  async _handleResponse (response: Response): Promise<Outcome<Result, Error>> {
+    response = await this._handleUnauthenticated(response)
+
+    return await super._handleResponse(response)
+  }
+
+  async _handleUnauthenticated (response: Response): Promise<Response> {
+    if (response.status === 401) {
+      this.commandState = 'refreshing_authentication'
+
+      const { RefreshLogin } = await import('./RefreshLogin')
+      // See if we can authenticate using the refresh token
+      const refreshCommand = new RefreshLogin()
+      const outcome = await refreshCommand.run()
+
+      if (outcome.isSuccess()) {
+        this.commandState = 'executing'
+        response = await this._issueRequest()
+      }
+    }
+
+    return response
+  }
+}

data/templates/Foobara/Auth/utils/accessTokens.ts.erb

@@ -0,0 +1,28 @@
+const accessTokens = new Map<string, string>()
+
+const logout = (urlBase: string): void => { accessTokens.delete(urlBase) }
+let handleLogout: (baseUrl: string) => void = logout
+
+const tokenForUrl = (baseUrl: string): string | undefined => accessTokens.get(baseUrl)
+const handleLogin: (baseUrl: string, accessToken: string) => void = (baseUrl, accessToken) => {
+  accessTokens.set(baseUrl, accessToken)
+}
+
+if (typeof BroadcastChannel !== 'undefined') {
+  const logoutChannel = new BroadcastChannel('foobara-auth-events')
+
+  logoutChannel.addEventListener('message', (event: MessageEvent<string>) => {
+    accessTokens.delete(event.data)
+  })
+
+  handleLogout = (baseUrl: string) => {
+    logout(baseUrl)
+    logoutChannel.postMessage(baseUrl)
+  }
+}
+
+export {
+  handleLogin,
+  handleLogout,
+  tokenForUrl
+}

data/templates/base/RemoteCommand.ts

@@ -1,16 +1,11 @@
 import { type Outcome, SuccessfulOutcome, ErrorOutcome } from './Outcome'
 import { type FoobaraError } from './Error'
 
-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 {
@@ -39,11 +34,11 @@ export default abstract class RemoteCommand<Inputs, Result, CommandError extends
     return (this.constructor as typeof RemoteCommand<Inputs, Result, CommandError>).domainName
   }
 
-  inputs: Inputs
+  inputs: Inputs | undefined
   outcome: null | Outcome<Result, CommandError>
-  commandState: commandState
+  commandState: string
 
-  constructor (inputs: Inputs) {
+  constructor (inputs: Inputs | undefined = undefined) {
     this.inputs = inputs
     this.commandState = 'initialized'
     this.outcome = null
@@ -77,68 +72,48 @@ export default abstract class RemoteCommand<Inputs, Result, CommandError extends
   }
 
   get commandPath (): string {
-    return this.fullCommandName.replace('::', '/')
+    return this.fullCommandName.replaceAll('::', '/')
   }
 
   async run (): Promise<Outcome<Result, CommandError>> {
-    const url = `${this.urlBase}/run/${this.commandPath}`
+    this.commandState = 'executing'
+    const response = await this._issueRequest()
 
-    const bearerToken = accessTokens[this.urlBase]
+    this.outcome = await this._handleResponse(response)
+
+    return this.outcome
+  }
 
-    const requestParams: RequestInit = {
+  _buildUrl (): string {
+    return `${this.urlBase}/run/${this.commandPath}`
+  }
+
+  _buildRequestParams (): RequestInit {
+    return {
       method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(this.inputs),
       credentials: 'include'
     }
+  }
 
-    requestParams.headers = { 'Content-Type': 'application/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)
-      }
-    }
+  async _issueRequest (): Promise<Response> {
+    return await fetch(this._buildUrl(), this._buildRequestParams())
+  }
 
-    const body = await response.json()
+  async _handleResponse (response: Response): Promise<Outcome<Result, CommandError>> {
+    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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-typescript-remote-command-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - Miles Georgi
@@ -56,6 +56,14 @@ files:
 - src/remote_generator/services/aggregate_model_generator.rb
 - src/remote_generator/services/atom_entity_generator.rb
 - src/remote_generator/services/atom_model_generator.rb
+- src/remote_generator/services/auth/access_tokens_generator.rb
+- src/remote_generator/services/auth/login_command_generator.rb
+- src/remote_generator/services/auth/login_generator.rb
+- src/remote_generator/services/auth/logout_command_generator.rb
+- src/remote_generator/services/auth/logout_generator.rb
+- src/remote_generator/services/auth/refresh_login_generator.rb
+- src/remote_generator/services/auth/requires_auth_command_generator.rb
+- src/remote_generator/services/auth/requires_auth_generator.rb
 - src/remote_generator/services/command_errors_generator.rb
 - src/remote_generator/services/command_errors_index_generator.rb
 - src/remote_generator/services/command_generator.rb
@@ -98,6 +106,10 @@ files:
 - templates/Entity/Unloaded.ts.erb
 - templates/EntityVariants.ts.erb
 - templates/Error.ts.erb
+- templates/Foobara/Auth/LoginCommand.ts.erb
+- templates/Foobara/Auth/LogoutCommand.ts.erb
+- templates/Foobara/Auth/RequiresAuthCommand.ts.erb
+- templates/Foobara/Auth/utils/accessTokens.ts.erb
 - templates/Model/Aggregate.ts.erb
 - templates/Model/Atom.ts.erb
 - templates/Model/Model.ts.erb