Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ PUBLIC_HASURA_CLIENT_URL=http://localhost:8080/v1/graphql
PUBLIC_HASURA_SERVER_URL=http://localhost:8080/v1/graphql
PUBLIC_HASURA_WEB_SOCKET_URL=ws://localhost:8080/v1/graphql
PUBLIC_WORKSPACE_CLIENT_URL=http://localhost:28000
PUBLIC_ACTION_INCLUDE_CREDENTIALS=false
PUBLIC_AUTH_SSO_ENABLED=false
PUBLIC_TIME_PLUGIN_ENABLED=false
PUBLIC_LIBRARY_SEQUENCES_ENABLED=false
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ on:
required: false

env:
ACTION_COOKIE_NAMES: '${{secrets.ACTION_COOKIE_NAMES}}'
ACTION_CORS_ALLOWED_ORIGIN: '${{secrets.ACTION_CORS_ALLOWED_ORIGIN}}'
AERIE_PASSWORD: '${{secrets.AERIE_PASSWORD}}'
AERIE_USERNAME: '${{secrets.AERIE_USERNAME}}'
HASURA_GRAPHQL_ADMIN_SECRET: '${{secrets.HASURA_GRAPHQL_ADMIN_SECRET}}'
Expand Down
2 changes: 2 additions & 0 deletions docker-compose-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ services:
PORT: 27186
AERIE_DB_HOST: postgres
AERIE_DB_PORT: 5432
ACTION_COOKIE_NAMES: '${ACTION_COOKIE_NAMES}'
ACTION_CORS_ALLOWED_ORIGIN: '${ACTION_CORS_ALLOWED_ORIGIN}'
ACTION_DB_USER: '${SEQUENCING_USERNAME}'
ACTION_DB_PASSWORD: '${SEQUENCING_PASSWORD}'
ACTION_LOCAL_STORE: /usr/src/app/action_file_store
Expand Down
31 changes: 16 additions & 15 deletions docs/ENVIRONMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@

This document provides detailed information about environment variables for Aerie UI.

| Name | Description | Type | Default |
| ---------------------------------- | ------------------------------------------------------------------------------------------------------------- | -------- | -------------------------------- |
| `ORIGIN` | Url of where the UI is served from. See the [Svelte Kit Adapter Node docs][svelte-kit-adapter-node-docs]. | `string` | http://localhost |
| `PUBLIC_AERIE_FILE_STORE_PREFIX` | Prefix to prepend to files uploaded through simulation configuration. | `string` | /usr/src/app/merlin_file_store/ |
| `PUBLIC_AUTH_SSO_ENABLED` | Whether to use the SSO-based auth flow, or the /login page auth flow | `string` | false |
| `PUBLIC_COMMAND_EXPANSION_MODE` | Sets the mode to be used for command expansion, typescript or templating | `string` | typescript |
| `PUBLIC_GATEWAY_CLIENT_URL` | Url of the Gateway as called from the client (i.e. web browser) | `string` | http://localhost:9000 |
| `PUBLIC_GATEWAY_SERVER_URL` | Url of the Gateway as called from the server (i.e. Node.js container) | `string` | http://localhost:9000 |
| `PUBLIC_ACTION_CLIENT_URL` | Url of the Action Server as called from the client (i.e. web browser) | `string` | http://localhost:27186 |
| `PUBLIC_HASURA_CLIENT_URL` | Url of Hasura as called from the client (i.e. web browser) | `string` | http://localhost:8080/v1/graphql |
| `PUBLIC_HASURA_SERVER_URL` | Url of Hasura as called from the server (i.e. Node.js container) | `string` | http://localhost:8080/v1/graphql |
| `PUBLIC_WORKSPACE_CLIENT_URL` | Url of the Workspace Service as called from the client (i.e. web browser) | `string` | http://localhost:28000 |
| `PUBLIC_HASURA_WEB_SOCKET_URL` | Url of Hasura called to establish a web-socket connection from the client | `string` | ws://localhost:8080/v1/grap |
| `PUBLIC_LIBRARY_SEQUENCES_ENABLED` | Whether to enable automatic loading of library sequences in all workspace sequence files | `string` | false |
| `PUBLIC_TIME_PLUGIN_ENABLED` | Whether the client should load a user-supplied `time-plugin.js` plugin from the `static/resources` directory. | `string` | false |
| Name | Description | Type | Default |
| ----------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | -------- | -------------------------------- |
| `ORIGIN` | Url of where the UI is served from. See the [Svelte Kit Adapter Node docs][svelte-kit-adapter-node-docs]. | `string` | http://localhost |
| `PUBLIC_AERIE_FILE_STORE_PREFIX` | Prefix to prepend to files uploaded through simulation configuration. | `string` | /usr/src/app/merlin_file_store/ |
| `PUBLIC_AUTH_SSO_ENABLED` | Whether to use the SSO-based auth flow, or the /login page auth flow | `string` | false |
| `PUBLIC_COMMAND_EXPANSION_MODE` | Sets the mode to be used for command expansion, typescript or templating | `string` | typescript |
| `PUBLIC_GATEWAY_CLIENT_URL` | Url of the Gateway as called from the client (i.e. web browser) | `string` | http://localhost:9000 |
| `PUBLIC_GATEWAY_SERVER_URL` | Url of the Gateway as called from the server (i.e. Node.js container) | `string` | http://localhost:9000 |
| `PUBLIC_ACTION_CLIENT_URL` | Url of the Action Server as called from the client (i.e. web browser) | `string` | http://localhost:27186 |
| `PUBLIC_ACTION_INCLUDE_CREDENTIALS` | Whether to include browser credentials (cookies) in requests to the Action Server. Required for cookie forwarding to actions. | `string` | false |
| `PUBLIC_HASURA_CLIENT_URL` | Url of Hasura as called from the client (i.e. web browser) | `string` | http://localhost:8080/v1/graphql |
| `PUBLIC_HASURA_SERVER_URL` | Url of Hasura as called from the server (i.e. Node.js container) | `string` | http://localhost:8080/v1/graphql |
| `PUBLIC_WORKSPACE_CLIENT_URL` | Url of the Workspace Service as called from the client (i.e. web browser) | `string` | http://localhost:28000 |
| `PUBLIC_HASURA_WEB_SOCKET_URL` | Url of Hasura called to establish a web-socket connection from the client | `string` | ws://localhost:8080/v1/grap |
| `PUBLIC_LIBRARY_SEQUENCES_ENABLED` | Whether to enable automatic loading of library sequences in all workspace sequence files | `string` | false |
| `PUBLIC_TIME_PLUGIN_ENABLED` | Whether the client should load a user-supplied `time-plugin.js` plugin from the `static/resources` directory. | `string` | false |
1 change: 1 addition & 0 deletions src/utilities/requests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export async function reqActionServer<T = any>(
};

const options: RequestInit = {
credentials: env.PUBLIC_ACTION_INCLUDE_CREDENTIALS === 'true' ? 'include' : 'omit',
headers,
method,
signal,
Expand Down
Loading