Skip to content

Commit 3410d36

Browse files
committed
chore(env): rename env vars to WEBEX_
1 parent bc36bb1 commit 3410d36

File tree

17 files changed

+30
-30
lines changed

17 files changed

+30
-30
lines changed

.env.default

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
CISCOSPARK_APPID_ORGID=Y2lzY29zcGFyazovL3VzL09SR0FOSVpBVElPTi80MjFhMWY4OC0zM2ViLTQ3MTUtOTY1ZS0zYzE5ZDYyZDJjMDk
2-
CISCOSPARK_ACCESS_TOKEN=
1+
WEBEX_APPID_ORGID=Y2lzY29zcGFyazovL3VzL09SR0FOSVpBVElPTi80MjFhMWY4OC0zM2ViLTQ3MTUtOTY1ZS0zYzE5ZDYyZDJjMDk
2+
WEBEX_ACCESS_TOKEN=
33
TO_PERSON_EMAIL=
44
SPACE_ID=
5-
CISCOSPARK_CLIENT_ID=
6-
CISCOSPARK_CLIENT_SECRET=
5+
WEBEX_CLIENT_ID=
6+
WEBEX_CLIENT_SECRET=
77
SAUCE_USERNAME=
88
SAUCE_ACCESS_KEY=
99
NETLIFY_SITE_ID=

CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ npm install
8282

8383
You'll need to create a file called `.env` that defines, at a minimum:
8484

85-
- `CISCOSPARK_CLIENT_ID`
86-
- `CISCOSPARK_CLIENT_SECRET`
87-
- `CISCOSPARK_REDIRECT_URI`
88-
- `CISCOSPARK_SCOPE`
89-
- `CISCOSPARK_ACCESS_TOKEN`
85+
- `WEBEX_CLIENT_ID`
86+
- `WEBEX_CLIENT_SECRET`
87+
- `WEBEX_REDIRECT_URI`
88+
- `WEBEX_SCOPE`
89+
- `WEBEX_ACCESS_TOKEN`
9090

9191
You can get these values by registering a new integration on the [developer portal](https://developer.ciscospark.com/add-integration.html).
9292

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ ansiColor('xterm') {
175175
nvm use v8.15.0
176176
version=`cat .version`
177177
export NODE_ENV=production
178-
export CISCOSPARK_SCOPES="Identity:OAuthClient webexsquare:get_conversation webexsquare:admin spark:people_read spark:rooms_read spark:rooms_write spark:memberships_read spark:memberships_write spark:messages_read spark:messages_write spark:applications_read spark:applications_write spark:teams_read spark:teams_write spark:team_memberships_read spark:team_memberships_write spark:bots_read spark:bots_write spark:kms"
178+
export WEBEX_SCOPE="Identity:OAuthClient webexsquare:get_conversation webexsquare:admin spark:people_read spark:rooms_read spark:rooms_write spark:memberships_read spark:memberships_write spark:messages_read spark:messages_write spark:applications_read spark:applications_write spark:teams_read spark:teams_write spark:team_memberships_read spark:team_memberships_write spark:bots_read spark:bots_write spark:kms"
179179
BUILD_PUBLIC_PATH="https://code.s4d.io/widget-space/archives/${version}/" npm run build:package widget-space
180180
BUILD_PUBLIC_PATH="https://code.s4d.io/widget-space/archives/${version}/" npm run build sri widget-space
181181
BUILD_BUNDLE_PUBLIC_PATH="https://code.s4d.io/widget-space/archives/${version}/" BUILD_PUBLIC_PATH="https://code.s4d.io/widget-space/archives/${version}/demo/" npm run build:package widget-space-demo

Jenkinsfile.tab

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pipeline {
2727
steps {
2828
echo "Starting Tab Tests"
2929
withCredentials([
30-
string(credentialsId: 'ddfd04fb-e00a-4df0-9250-9a7cb37bce0e', variable: 'CISCOSPARK_CLIENT_SECRET'),
30+
string(credentialsId: 'ddfd04fb-e00a-4df0-9250-9a7cb37bce0e', variable: 'WEBEX_CLIENT_SECRET'),
3131
usernamePassword(credentialsId: 'SAUCE_LABS_VALIDATED_MERGE_CREDENTIALS', passwordVariable: 'SAUCE_ACCESS_KEY', usernameVariable: 'SAUCE_USERNAME'),
3232
]) {
3333
retry(2){
@@ -40,9 +40,9 @@ pipeline {
4040
# alters the environment.
4141
npm config delete prefix
4242
# Run tests
43-
CISCOSPARK_CLIENT_ID=C873b64d70536ed26df6d5f81e01dafccbd0a0af2e25323f7f69c7fe46a7be340 SAUCE=true BROWSER=firefox VERSION=beta npm run test:tap
44-
CISCOSPARK_CLIENT_ID=C873b64d70536ed26df6d5f81e01dafccbd0a0af2e25323f7f69c7fe46a7be340 SAUCE=true BROWSER=chrome VERSION=beta npm run test:tap
45-
CISCOSPARK_CLIENT_ID=C873b64d70536ed26df6d5f81e01dafccbd0a0af2e25323f7f69c7fe46a7be340 SAUCE=true BROWSER=chrome PLATFORM="windows 10" VERSION=beta npm run test:tap
43+
WEBEX_CLIENT_ID=C873b64d70536ed26df6d5f81e01dafccbd0a0af2e25323f7f69c7fe46a7be340 SAUCE=true BROWSER=firefox VERSION=beta npm run test:tap
44+
WEBEX_CLIENT_ID=C873b64d70536ed26df6d5f81e01dafccbd0a0af2e25323f7f69c7fe46a7be340 SAUCE=true BROWSER=chrome VERSION=beta npm run test:tap
45+
WEBEX_CLIENT_ID=C873b64d70536ed26df6d5f81e01dafccbd0a0af2e25323f7f69c7fe46a7be340 SAUCE=true BROWSER=chrome PLATFORM="windows 10" VERSION=beta npm run test:tap
4646
'''
4747
}
4848
}

Jenkinsfile.tap

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pipeline {
2828
steps {
2929
echo "Starting Tap Tests"
3030
withCredentials([
31-
string(credentialsId: 'ddfd04fb-e00a-4df0-9250-9a7cb37bce0e', variable: 'CISCOSPARK_CLIENT_SECRET'),
31+
string(credentialsId: 'ddfd04fb-e00a-4df0-9250-9a7cb37bce0e', variable: 'WEBEX_CLIENT_SECRET'),
3232
usernamePassword(credentialsId: 'SAUCE_LABS_VALIDATED_MERGE_CREDENTIALS', passwordVariable: 'SAUCE_ACCESS_KEY', usernameVariable: 'SAUCE_USERNAME'),
3333
]) {
3434
retry(2){
@@ -41,7 +41,7 @@ pipeline {
4141
# alters the environment.
4242
npm config delete prefix
4343
# Run tests
44-
CISCOSPARK_CLIENT_ID=C873b64d70536ed26df6d5f81e01dafccbd0a0af2e25323f7f69c7fe46a7be340 SAUCE=true npm run test:tap
44+
WEBEX_CLIENT_ID=C873b64d70536ed26df6d5f81e01dafccbd0a0af2e25323f7f69c7fe46a7be340 SAUCE=true npm run test:tap
4545
'''
4646
}
4747
}

packages/node_modules/@ciscospark/react-redux-spark/src/inject-spark.test.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/node_modules/@ciscospark/react-redux-spark/src/spark.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/node_modules/@ciscospark/widget-meet/src/index.html

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/node_modules/@ciscospark/widget-recents/README.md

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/node_modules/@ciscospark/widget-recents/src/index.html

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/node_modules/@ciscospark/widget-space/README.md

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/node_modules/@ciscospark/widget-space/src/index.html

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/tests/beforeSuite.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @param {Object} suite suite details
44
*/
55
module.exports = () => {
6-
process.env.CISCOSPARK_SCOPE = [
6+
process.env.WEBEX_SCOPE = [
77
'webexsquare:get_conversation',
88
'spark:people_read',
99
'spark:rooms_read',

scripts/webpack/webpack.base.babel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default (options, env) => {
1717
const plugins = [
1818
new webpack.EnvironmentPlugin([
1919
'NODE_ENV',
20-
'CISCOSPARK_CLIENT_ID',
20+
'WEBEX_CLIENT_ID',
2121
'REACT_CISCOSPARK_VERSION',
2222
'WDM_SERVICE_URL',
2323
'IDBROKER_BASE_URL',

scripts/webpack/webpack.dev.babel.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ const plugins = [
1717
}
1818
}),
1919
new webpack.EnvironmentPlugin([
20-
'CISCOSPARK_ACCESS_TOKEN',
21-
'CISCOSPARK_CLIENT_ID',
20+
'WEBEX_ACCESS_TOKEN',
21+
'WEBEX_CLIENT_ID',
2222
'SPACE_ID',
2323
'TO_PERSON_EMAIL',
2424
'TO_PERSON_ID'

scripts/webpack/webpack.prod.babel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default (env) => webpackBaseConfig({
6262
plugins,
6363
// Reset env values we don't want to see in bundles
6464
env: {
65-
CISCOSPARK_ACCESS_TOKEN: '',
65+
WEBEX_ACCESS_TOKEN: '',
6666
TO_PERSON_EMAIL: '',
6767
TO_PERSON_ID: ''
6868
}

test/journeys/lib/test-users.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import {deconstructHydraId} from './hydra';
1616
* @returns {Promise<object>}
1717
*/
1818
export function setupTestUserJwt({displayName}) {
19-
if (!(process.env.CISCOSPARK_APPID_ORGID && process.env.CISCOSPARK_APPID_SECRET)) {
20-
throw new Error('CISCOSPARK_APPID_ORGID and CISCOSPARK_APPID_SECRET are required to generate guest tokens');
19+
if (!(process.env.WEBEX_APPID_ORGID && process.env.WEBEX_APPID_SECRET)) {
20+
throw new Error('WEBEX_APPID_ORGID and WEBEX_APPID_SECRET are required to generate guest tokens');
2121
}
2222

2323
return createGuestUser({displayName})

0 commit comments

Comments
 (0)