Browse Source

removed ADMIN_SECRET env var (no longer needed)

pull/348/head
Michael Shanks 6 years ago
parent
commit
48d60a7183
  1. 21
      packages/builder/cypress/plugins/index.js
  2. 2
      packages/builder/cypress/setup.js
  3. 3
      packages/server/.env.template
  4. 1
      packages/server/scripts/jestSetup.js
  5. 1
      packages/server/src/environment.js

21
packages/builder/cypress/plugins/index.js

@ -0,0 +1,21 @@
/// <reference types="cypress" />
// ***********************************************************
// This example plugins/index.js can be used to load plugins
//
// You can change the location of this file or turn off loading
// the plugins file with the 'pluginsFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/plugins-guide
// ***********************************************************
// This function is called when a project is opened or re-opened (e.g. due to
// the project's config changing)
/**
* @type {Cypress.PluginConfig}
*/
module.exports = (on, config) => {
// `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config
}

2
packages/builder/cypress/setup.js

@ -11,7 +11,7 @@ const run = require("../../cli/src/commands/run/runHandler")
rimraf.sync(homedir)
init({ dir: homedir })
init({ dir: homedir, clientId: "cypress-test" })
.then(() => {
run({ dir: homedir })
})

3
packages/server/.env.template

@ -5,9 +5,6 @@ COUCH_DB_URL={{couchDbUrl}}
# identifies a client database - i.e. group of apps
CLIENT_ID={{clientId}}
# Full access API key for server
ADMIN_SECRET={{adminSecret}}
# used to create cookie hashes
JWT_SECRET={{cookieKey1}}

1
packages/server/scripts/jestSetup.js

@ -4,5 +4,4 @@ process.env.NODE_ENV = "jest"
process.env.JWT_SECRET = "test-jwtsecret"
process.env.CLIENT_ID = "test-client-id"
process.env.BUDIBASE_DIR = tmpdir("budibase-unittests")
process.env.ADMIN_SECRET = "test-admin-secret"
process.env.LOG_LEVEL = "silent"

1
packages/server/src/environment.js

@ -3,7 +3,6 @@ module.exports = {
NODE_ENV: process.env.NODE_ENV,
JWT_SECRET: process.env.JWT_SECRET,
BUDIBASE_DIR: process.env.BUDIBASE_DIR,
ADMIN_SECRET: process.env.ADMIN_SECRET,
PORT: process.env.PORT,
COUCH_DB_URL: process.env.COUCH_DB_URL,
SALT_ROUNDS: process.env.SALT_ROUNDS,

Loading…
Cancel
Save