Skip to content
This repository has been archived by the owner on Aug 31, 2021. It is now read-only.

Commit

Permalink
Merge pull request #89 from vulcanize/feature/configurableMutations
Browse files Browse the repository at this point in the history
Disable default mutations is now in config file
  • Loading branch information
ana0 authored May 2, 2019
2 parents 77b7ee9 + 754c8cb commit 202fb6e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
4 changes: 2 additions & 2 deletions postgraphile/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ Build the docker image in this directory. Start the `GraphiQL` frontend by:
* GraphiQL frontend is available at `:3000/graphiql`
GraphQL endpoint is available at `:3000/graphql`

By default, this build will expose only the "public" schema - to add other schemas, use either the env variables,
or a config file `config.toml` and set the env var `CONFIG_PATH` to point to its location. Example `toml`:
By default, this build will expose only the "public" schema and will disable mutations - to change mutation behaviour, you can use an optional config file `config.toml` and set the env var `POSTGRAPHILE_CONFIG_PATH` to point to its location. Example `toml`:

```
[database]
Expand All @@ -34,6 +33,7 @@ or a config file `config.toml` and set the env var `CONFIG_PATH` to point to its
gq_schemas = ["public", "yourschema"]
gq_user = "graphql"
gq_password = "graphql"
disable_default_mutations = false
```

## Building
Expand Down
3 changes: 2 additions & 1 deletion postgraphile/spec/server/config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ describe('buildServerConfig', () => {
host: 'example.com',
database: 'example_database',
schemas: ['public'],
ownerConnectionString: 'postgres://admin:admin@host'
ownerConnectionString: 'postgres://admin:admin@host',
disableDefaultMutations: true
};

postgraphileMiddleware = jasmine
Expand Down
7 changes: 6 additions & 1 deletion postgraphile/src/config/parse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export function parseConfig(
let gqSchemas = ['public'];
let gqUser = '';
let gqPassword = '';
let disableDefaultMutations = true;

if (configPath) {
const tomlContents = readCallback(`${configPath}`).toString();
Expand All @@ -37,6 +38,9 @@ export function parseConfig(
gqSchemas = parsedToml['database']['gq_schemas'];
gqUser = parsedToml['database']['gq_user'] || gqUser;
gqPassword = parsedToml['database']['gq_password'] || gqPassword;
disableDefaultMutations = parsedToml['database']['disable_default_mutations'] === undefined
? true
: parsedToml['database']['disable_default_mutations'];
}

// Overwrite config values with env. vars if such are set
Expand Down Expand Up @@ -69,6 +73,7 @@ export function parseConfig(
: `postgres://${user}:${password}@${host}:${port}`,
database,
schemas: gqSchemas,
ownerConnectionString: `postgres://${user}:${password}@${host}:${port}/${database}`
ownerConnectionString: `postgres://${user}:${password}@${host}:${port}/${database}`,
disableDefaultMutations
};
}
4 changes: 2 additions & 2 deletions postgraphile/src/server/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
PostgraphileOptions
} from '../adapters/postgraphile';

export const CONFIG_PATH_KEY = 'CONFIG_PATH';
export const CONFIG_PATH_KEY = 'POSTGRAPHILE_CONFIG_PATH';
export const SERVER_PORT_KEY = 'SERVER_PORT';

const DEFAULT_SERVER_PORT = '3000';
Expand All @@ -27,7 +27,7 @@ export function buildServerConfig(

const options: PostgraphileOptions = {
appendPlugins: [PgSimplifyInflectorPlugin],
disableDefaultMutations: true,
disableDefaultMutations: databaseConfig.disableDefaultMutations,
enableCors: true,
exportGqlSchemaPath: 'schema.graphql',
graphiql: true,
Expand Down
1 change: 1 addition & 0 deletions postgraphile/src/server/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export interface DatabaseConfig {
database: string;
schemas: string[];
ownerConnectionString: string;
disableDefaultMutations: boolean;
}

export interface ServerConfig {
Expand Down

0 comments on commit 202fb6e

Please sign in to comment.