diff --git a/.gitignore b/.gitignore index df3fb65db..0e1bd5c52 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,7 @@ docker-compose\.demo\.yml docker-compose\.demo_with_prisma\.yml env_demo/ + +client/\.env-demo + +docker-compose\.demo\.prisma\.yml diff --git a/client/src/App.js b/client/src/App.js index 121a9f702..902a03bb8 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -39,7 +39,6 @@ export const MasterApp = props => ( { - auth.handleAuthentication(props) return }} /> diff --git a/client/src/auth/index.js b/client/src/auth/index.js index 099cd1373..7a654016d 100644 --- a/client/src/auth/index.js +++ b/client/src/auth/index.js @@ -1,16 +1,11 @@ import Auth0Lock from 'auth0-lock' import gql from 'graphql-tag' - import { getItem, setItem } from '../utils/local-storage' import { validObject, deleteCookie, slugify, isEmpty } from '../utils/js-helpers' import Log from '../utils/log' - import { client } from '../graphql/apollo' - import { AUTH_CONFIG } from './Auth0' // create by renaming Auth0.sample.js to Auth0.js and setting vars -import { setInitialEcosystem } from '../utils/ecosystem' - const AUTHENTICATE = gql` mutation authenticate($idToken: String!) { users_Authenticate(idToken: $idToken) { @@ -187,7 +182,7 @@ class Auth { window.location.href = '/' return true } catch (err) { - console.log('Sign in or create account error: ', err) + console.log('Sign in or create account error.') window.localStorage.removeItem('access_token') window.localStorage.removeItem('id_token') window.localStorage.removeItem('expires_at') diff --git a/docker-compose.linux.yml b/docker-compose.linux.yml index f363310ad..71b27f8f7 100644 --- a/docker-compose.linux.yml +++ b/docker-compose.linux.yml @@ -189,7 +189,7 @@ services: image: superalgos/master-app-api:0.1.0 restart: always env_file: ./env/master-app-api.env - command: sh -c './wait-for users-api:4000 -- ./wait-for teams-api:4001 -- ./wait-for keyvault-api:4002 -- ./wait-for clones-api:4003 -- ./wait-for saweb-api:4004 -- ./wait-for events-api:4005 -- ./wait-for notifications-api:4006 -- ./wait-for logs-api:4007 -- ./wait-for strategizer-api:4008 -- ./wait-for cockpit-api:4009 -- node .' + command: sh -c './wait-for users-api:4000 -- ./wait-for teams-api:4001 -- ./wait-for keyvault-api:4002 -- ./wait-for clones-api:4003 -- ./wait-for saweb-api:4004 -- ./wait-for events-api:4005 -- ./wait-for notifications-api:4006 -- ./wait-for logs-api:4007 -- ./wait-for strategizer-api:4008 -- ./wait-for cockpit-api:4009 -- node .' ports: - "4100:4100" networks: diff --git a/docker-compose.win.yml b/docker-compose.win.yml index bead26640..84404f7ef 100644 --- a/docker-compose.win.yml +++ b/docker-compose.win.yml @@ -17,6 +17,8 @@ services: image: minio/minio:RELEASE.2019-07-05T21-20-21Z volumes: - 'C:\superalgos\data:/data' + ports: + - "9000:9000" environment: MINIO_ACCESS_KEY: minio MINIO_SECRET_KEY: minio123 @@ -40,6 +42,8 @@ services: user: prisma password: prisma migrations: true + ports: + - "4466:4466" volumes: - postgresdb_data:/data/db networks: @@ -62,6 +66,8 @@ services: restart: always env_file: ./env/teams-api.env command: sh -c './wait-for prisma:4466 -- node .' + ports: + - "4001:4001" networks: - superalgos_net depends_on: @@ -92,6 +98,8 @@ services: restart: always env_file: ./env/saweb-api.env command: node . + ports: + - "4004:4004" networks: - superalgos_net depends_on: @@ -102,6 +110,8 @@ services: restart: always env_file: ./env/logs-api.env command: node . + ports: + - "4007:4007" networks: - superalgos_net depends_on: @@ -112,6 +122,8 @@ services: restart: always env_file: ./env/clones-api.env command: node . + ports: + - "4003:4003" networks: - superalgos_net depends_on: @@ -122,6 +134,8 @@ services: restart: always env_file: ./env/cockpit-api.env command: node . + ports: + - "4009:4009" networks: - superalgos_net depends_on: @@ -132,6 +146,8 @@ services: restart: always env_file: ./env/strategizer-api.env command: node . + ports: + - "4008:4008" networks: - superalgos_net depends_on: @@ -142,6 +158,8 @@ services: restart: always env_file: ./env/events-api.env command: node . + ports: + - "4005:4005" networks: - superalgos_net depends_on: @@ -152,6 +170,8 @@ services: restart: always env_file: ./env/users-api.env command: node . + ports: + - "4000:4000" networks: - superalgos_net depends_on: @@ -162,6 +182,8 @@ services: restart: always env_file: ./env/keyvault-api.env command: node . + ports: + - "4002:4002" networks: - superalgos_net depends_on: @@ -172,6 +194,8 @@ services: restart: always env_file: ./env/notifications-api.env command: node . + ports: + - "4006:4006" networks: - superalgos_net depends_on: @@ -191,7 +215,7 @@ services: image: superalgos/master-app-api:0.1.0 restart: always env_file: ./env/master-app-api.env - command: sh -c './wait-for users-api:4000 -- ./wait-for teams-api:4001 -- ./wait-for keyvault-api:4002 -- ./wait-for clones-api:4003 -- ./wait-for saweb-api:4004 -- ./wait-for events-api:4005 -- ./wait-for notifications-api:4006 -- ./wait-for logs-api:4007 -- ./wait-for strategizer-api:4008 -- ./wait-for cockpit-api:4009 -- node .' + command: sh -c './wait-for users-api:4000 -- ./wait-for teams-api:4001 -- ./wait-for keyvault-api:4002 -- ./wait-for clones-api:4003 -- ./wait-for saweb-api:4004 -- ./wait-for events-api:4005 -- ./wait-for notifications-api:4006 -- ./wait-for logs-api:4007 -- ./wait-for strategizer-api:4008 -- ./wait-for cockpit-api:4009 -- node .' ports: - "4100:4100" networks: diff --git a/env/aaweb.env b/env/aaweb.env index 787c296fc..0f9bb089e 100644 --- a/env/aaweb.env +++ b/env/aaweb.env @@ -10,4 +10,4 @@ LOG_FILE_CONTENT=false PATH_TO_CANVAS_APP=./dependency/CanvasApp PATH_TO_FILES_COMPONENT=./dependency/Files-Component/src -GATEWAY_ENDPOINT=http://master-app-api:4100/graphql +GATEWAY_ENDPOINT=http://host.docker.internal:4100/graphql diff --git a/env/clones-api.env b/env/clones-api.env index 598de1466..89eecfef3 100644 --- a/env/clones-api.env +++ b/env/clones-api.env @@ -1,10 +1,12 @@ NODE_ENV=production PORT=4003 -# Database configuration -MONGO_URL=mongodb://mongo/operations +FULL_LOG=false -GATEWAY_ENDPOINT=http://master-app-api:4100/graphql +# Database configuration +MONGO_URL=mongodb://host.docker.internal:27017/operations + +GATEWAY_ENDPOINT=http://host.docker.internal:4100/graphql OPERATIONS_API_PRESHARED=clones_key # Temporary restriction on asset balances @@ -13,15 +15,13 @@ DEFAULT_BALANCE_ASSET_A=0 DEFAULT_BALANCE_ASSET_B=0.001 # Kubernetes configuration -GATEWAY_ENDPOINT_K8S=http://localhost:4100/graphql -CLUSTER_SERVER=https://kubernetes:6445 -CLONE_EXECUTOR_IMAGE=superalgos/clone-executor:1.0.30 +GATEWAY_ENDPOINT_K8S=http://host.docker.internal:4100/graphql +CLONE_EXECUTOR_IMAGE=superalgos/clone-executor:1.0.48 +CLUSTER_SERVER=https://kubernetes:6445 CLUSTER_NAME=docker-for-desktop-cluster -# CERTIFICATE_AUTHORITY_DATA= INSECURE_SKIP_TLS_VERIFY=true CONTEXT_NAME=docker-for-desktop USER_NAME=docker-for-desktop -# USER_PASSWORD= -CLIENT_CERTIFICATE_DATA= -CLIENT_KEY_DATA= +CLIENT_CERTIFICATE_DATA=LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM5RENDQWR5Z0F3SUJBZ0lJU2doRTQ5cFpBdEV3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBME1Ua3hOVE13TXpOYUZ3MHlNREExTURJeE5ETXhNVFJhTURZeApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sc3dHUVlEVlFRREV4SmtiMk5yWlhJdFptOXlMV1JsCmMydDBiM0F3Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ3VERGppbnl5V3l4aVUKbVlzelIxUXhCdzAxZUltVTRnMU1VQVRIN3FCazFVdWdVVHAzWVUzWVJ1NitGdnpwbHVoY2lWVFByeDdDamRvcwo2ODBsM0pVWTdTZzdIYjNQTlRhQm9PdnlxSGVXYmd4TDBsQitXeG1lVEJ4QnlBV09VR0Fmd0pHVnBRL2JTQnNwCndhYmJrdXpmMzRxcFFreHFrRVVwbDlHOUhaNFZrZ0Mvb280Tm1YTlBOMmlSMkowUXN0TjY4ZmZqcGNQSVJCdzAKR3h5ZVJPNzh6SUQralpDYi9hUGt3YnZpVmNEV1ZvSU9VbWlUQlFzd1dTMCtzWG5tamtjWW8rR2JjVmdsT3BLVApxN0lPOUZoaDVGZ1RLZk9SYmxLNXl3YXdETXN2TmpVbEFUZ2ZKODU5ZXFRaGo3RlFSRUpQRkY2MGVId0Q4RGhhClpqL3ZLbnlwQWdNQkFBR2pKekFsTUE0R0ExVWREd0VCL3dRRUF3SUZvREFUQmdOVkhTVUVEREFLQmdnckJnRUYKQlFjREFqQU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFHM05RT1VNclJ3bHZINDRLRjMvSFV2eGxxTi9SRlpyQQpHZWlWREJ6cUpDd2wwSFBNQkh4T0ZCVnEvQ1dTQVNjeDJlV0xQWG5PNXBJOWFJckN5R3c3Y3A5S290TUVkVW4vCmVpMmVPdE1NSkpTMGt6empqUGNtOHZ2OXNNN2pvQXhWQkF1cG5VaStJMDRmSVRIcDlpSkxET29uUzJoanBpYm0KZzVQNlVUTGFBanUrNUhqRTZHZkNROFh2WVRRbytjUlV3MjhZd1l0SG5Cam5KVVRtK2lXand6WTJtbG1odGZlbQpJSkkzNGhXeEYrZHl6eVR4NEQ1aTNyeGtiWm5vQ3JTK1A2YmNWUFMvSWkreUk2WjdjKzlvdVNjaWlHRmNSWGhRCkMwa0NvV1k2L2FEYlVZRzZvSVdZZVB3OXhQbWVsdCtyRHdJdHFyYU5TWE9MQVV4R1llZmZXQT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K +CLIENT_KEY_DATA=LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBcmd3NDRwOHNsc3NZbEptTE0wZFVNUWNOTlhpSmxPSU5URkFFeCs2Z1pOVkxvRkU2CmQyRk4yRWJ1dmhiODZaYm9YSWxVejY4ZXdvM2FMT3ZOSmR5VkdPMG9PeDI5enpVMmdhRHI4cWgzbG00TVM5SlEKZmxzWm5rd2NRY2dGamxCZ0g4Q1JsYVVQMjBnYktjR20yNUxzMzkrS3FVSk1hcEJGS1pmUnZSMmVGWklBdjZLTwpEWmx6VHpkb2tkaWRFTExUZXZIMzQ2WER5RVFjTkJzY25rVHUvTXlBL28yUW0vMmo1TUc3NGxYQTFsYUNEbEpvCmt3VUxNRmt0UHJGNTVvNUhHS1BobTNGWUpUcVNrNnV5RHZSWVllUllFeW56a1c1U3Vjc0dzQXpMTHpZMUpRRTQKSHlmT2ZYcWtJWSt4VUVSQ1R4UmV0SGg4QS9BNFdtWS83eXA4cVFJREFRQUJBb0lCQVFDWWpXZnk0dmV2T0ZiVQpNUHo4dGtHS001Y1ZUaEN4YWEya1BPTGo1em01QitlZ25uSHpuMXNlL1pWWEVra2Q2VUxEa1MvQVZjdE5WZzVzCm4wWVNNSlNTNDVRR3ROdmcyZEJyc0lQL0RrQzducnV5WGFabUNpMmJQVFRyUjRudkltNE9ocmhVaFBnd0NMU2UKVmZtTnJldG5rc1V6OUVPTWgrWEhQaVg5Y0E5VzhVOEM5UGNoU3ZxSjFGR3crc0paLysyeGltdnF0RnUzMEZ0egphUkxOaEFVTmpGN2xuUUZhZS9pS2xGcDJ2MWRteXRCMUp5eTRkRzl1TFJSWWN4Qy9pa1Q4VUUzZ1RVdGR2V2lNClE4QXlQaVEvVVl3THVmazMreFIyUGxLUEFMdEF4MHhzWVJKTWVmaFJpWFlJWXZoa2srRTZPdGZyc2ZzZW15REoKODdRNzM3bnhBb0dCQU5pNy9GdkhBbmdnc1V3VDMzM1hoNzk5OGhiNTRWSzU1Yzc5MEtnRm9yeUpUYnhIWU5PZQpvRkdWbWd5YU92d1hWbnVhZFpoNlpsRU9mMXJXbVNPcWFXRjlGNFhYdnB6NWZuajJJUU1xV2ZUOTViSC9yaGRTClMzQTd1RmxQL3RlcS9JMmlpbHhsSFhKa3lEemxKeDJlbDhWR1hHeXpxTjBBZ3RPdjdvMElhYU9WQW9HQkFNMlUKZFJSMG5mRnd3MGpjVHVvU0ZBalBIaytEQnorZVRwbVFQWWZIZTJpb21qM0hadEkyMm1adG9sV1l4UTNqRjlPbAp5RkFvY2RjK2trS1V4VVBkMng3Qm44VkE5Rkg5bkN2NEZ1VDRJNmRPbUZkeWZtc3R1MkRnSWQ3aThYeGdURlM5CklPL0lqTWhuRzIzaHBVSkZDTU5VOCtMRXBKeUZBR29YK2lvcnFtL0ZBb0dCQU1IL2txWDcvc1BVVDU4UGNzOUwKcXlERzlYbUhkaDc4Y3kzU2w0Q3VlcnBVRkpiaE5WUjIrbjNNY1RXeW4vV2lWakVSVXcySEVpcWYxWE5ULzRPagpOK3loY2ZyRjRNTFZ1RlZCeXM3d2k5RDFxekttOEFmRUMrNk1KamtibDdzb1BDUHpSL0hvT0hGNnNKbUJiSC9nCncyMDd5K01vOVkvTXMwNFVmbTBUQ0t2NUFvR0JBTWl6dlRJQlFBbHRHMXBRcTBKZDcrMUJ0OGZNbGhFSURwaGgKZDVETnNhL1ZtdS9oY29LY1J0QmxERzBndnBEMk9sYklyUzJFcnMrREtPdVRycHE1UjZsWlF4QWlmK1JrQWtueQo1UGNaUWtXZXQ1LzRDVys5c0FlK0NaTStZS0FhcTZxM0VpYkcxcHIzL3BGaUVDTUlucXVFanEyL2FTM2RzeS9nCnhMelM4SXc1QW9HQUNOR2hlOWZmVkVCTDREZ1B5YjViNDhLVmttT2loMnl5VkMxTkRtakdiYWVhTWhLQzNzekQKMEVqZU0zTmNjNnViVmNGTGVUV0JBc2hJTk1zSENCWmZISFpRZk9ybkQ3dHNBY1M3MGt5eFBxZzc0c25TSEZPcAoxMlRXQnVFNUU5V2l0aW1JZHRJZWhwdlVLZVZWUTd0NXgrSnNsS2N3MnZ4YjdWV1E2SWg1cURrPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo= diff --git a/env/cockpit-api.env b/env/cockpit-api.env index c61f41fb4..a5cd08efd 100644 --- a/env/cockpit-api.env +++ b/env/cockpit-api.env @@ -3,4 +3,4 @@ PORT=4009 PRESHARED_GATEWAY_KEY=cockpit_key -MONGO_URL=mongodb://mongo/cockpit +MONGO_URL=mongodb://host.docker.internal:27017/cockpit diff --git a/env/events-api.env b/env/events-api.env index 6578bf6f7..2cfdb0c95 100644 --- a/env/events-api.env +++ b/env/events-api.env @@ -1,9 +1,9 @@ NODE_ENV=production PORT=4005 -MONGO_URL=mongodb://mongo/operations +MONGO_URL=mongodb://host.docker.internal:27017/operations -GATEWAY_ENDPOINT=http://master-app-api:4100/graphql +GATEWAY_ENDPOINT=http://host.docker.internal:4100/graphql PRESHARED_GATEWAY_KEY=events_key SENTRY_DNS=https://55a47295db124d01af0120be919eff93@sentry.io/1313621 diff --git a/env/keyvault-api.env b/env/keyvault-api.env index a321b16c9..d9d864b06 100644 --- a/env/keyvault-api.env +++ b/env/keyvault-api.env @@ -1,9 +1,9 @@ NODE_ENV=production PORT=4002 -MONGO_URL=mongodb://mongo/keyvault +MONGO_URL=mongodb://host.docker.internal:27017/keyvault -GATEWAY_ENDPOINT=http://master-app-api:4100/graphql +GATEWAY_ENDPOINT=http://host.docker.internal:4100/graphql KEYVAULT_API_PRESHARED=keyvault_key SERVER_SECRET=9%o|i6-mlihgOd&fXeUDB&ae+j"dnM+* diff --git a/env/master-app-api.env b/env/master-app-api.env index ab1dca8b3..ea4c5b45e 100644 --- a/env/master-app-api.env +++ b/env/master-app-api.env @@ -9,20 +9,19 @@ STRATEGIZER_API_PRESHARED=strategizer_keys COCKPIT_API_PRESHARED=cockpit_key SAWEB_API_PRESHARED=saweb_key -GRAPHQL_API_URL=http://localhost:4100/graphql +GRAPHQL_API_URL=http://host.docker.internal:4100/graphql -TEAMS_API_URL=http://teams-api:4001/graphql -USERS_API_URL=http://users-api:4000/graphql -EVENTS_API_URL=http://events-api:4005/graphql -KEYVAULT_API_URL=http://keyvault-api:4002/graphql -NOTIFICATIONS_API_URL=http://notifications-api:4006/graphql -OPERATIONS_API_URL=http://clones-api:4003/graphql -LOGS_API_URL=http://logs-api:4007/graphql -STRATEGIZER_API_URL=http://strategizer-api:4008/graphql -COCKPIT_API_URL=http://cockpit-api:4009/graphql -SAWEB_API_URL=http://saweb-api:4004/graphql +TEAMS_API_URL=http://host.docker.internal:4001/graphql +USERS_API_URL=http://host.docker.internal:4000/graphql +EVENTS_API_URL=http://host.docker.internal:4005/graphql +KEYVAULT_API_URL=http://host.docker.internal:4002/graphql +NOTIFICATIONS_API_URL=http://host.docker.internal:4006/graphql +OPERATIONS_API_URL=http://host.docker.internal:4003/graphql +LOGS_API_URL=http://host.docker.internal:4007/graphql +STRATEGIZER_API_URL=http://host.docker.internal:4008/graphql +COCKPIT_API_URL=http://host.docker.internal:4009/graphql +SAWEB_API_URL=http://host.docker.internal:4004/graphql AUTH0_DOMAIN=superalgos.eu.auth0.com AUTH0_AUDIENCE=https://auth-local.superalgos.org AUTH0_ISSUER=https://superalgos.eu.auth0.com/ - diff --git a/env/master-app.env b/env/master-app.env index a510c90db..bc938c5cd 100644 --- a/env/master-app.env +++ b/env/master-app.env @@ -1,12 +1,12 @@ NODE_ENV=production PORT=3100 -PLATFORM_API_URL=http://localhost:4100/graphql -CANVAS_URL=http://localhost:4101/ +PLATFORM_API_URL=http://host.docker.internal:4100/graphql +CANVAS_URL=http://host.docker.internal:4101/ AUTH0_DOMAIN=superalgos.eu.auth0.com AUTH0_AUDIENCE=https://auth-local.superalgos.org AUTH0_ISSUER=https://superalgos.eu.auth0.com/ AUTH0_CLIENTID=jfendNx2Vpa3LJa58x8lEmoPTG3nJV3B -AUTH0_CALLBACK_URL=http://localhost:3100/callback -AUTH0_LOGOUT_URL=http://localhost:3100 +AUTH0_CALLBACK_URL=http://host.docker.internal:3100/callback +AUTH0_LOGOUT_URL=http://host.docker.internal:3100 diff --git a/env/saweb-api.env b/env/saweb-api.env index 0c3309d98..932aad7c6 100644 --- a/env/saweb-api.env +++ b/env/saweb-api.env @@ -1,15 +1,15 @@ NODE_ENV=production PORT=4004 -# LOG_LEVEL=info +LOG_LEVEL=error -MONGO_URL=mongodb://mongo/saweb +MONGO_URL=mongodb://host.docker.internal:27017/saweb -GATEWAY_ENDPOINT=http://master-app-api:4100/graphql +GATEWAY_ENDPOINT=http://host.docker.internal:4100/graphql PRESHARED_GATEWAY_KEY=saweb_key # The NODE_ENDPOINT is used at team creation and is where other components will search for the team -NODE_ENDPOINT=http://localhost:4100/ +NODE_ENDPOINT=http://host.docker.internal:4100/ # Storage Configuration STORAGE_PROVIDER=Minio diff --git a/env/strategizer-api.env b/env/strategizer-api.env index df17d4b92..6ab84ea97 100644 --- a/env/strategizer-api.env +++ b/env/strategizer-api.env @@ -1,7 +1,7 @@ NODE_ENV=production PORT=4008 -MONGO_URL=mongodb://mongo/strategies +MONGO_URL=mongodb://host.docker.internal:27017/strategies -GATEWAY_ENDPOINT=http://master-app-api:4100/graphql +GATEWAY_ENDPOINT=http://host.docker.internal:4100/graphql PRESHARED_GATEWAY_KEY=strategizer_keys diff --git a/env/teams-api.env b/env/teams-api.env index b3e6ad7b5..9ba68bb78 100644 --- a/env/teams-api.env +++ b/env/teams-api.env @@ -9,6 +9,6 @@ PRISMA_ENDPOINT=http://prisma:4466 GENERATE_SOURCEMAP=true SCHEMA_PATH=src/generated/prisma.graphql -PLATFORM_API_URL=http://master-app-api:4100/graphql +PLATFORM_API_URL=http://host.docker.internal:4100/graphql STORAGE_URL=https://aadevelop.blob.core.windows.net diff --git a/env/users-api.env b/env/users-api.env index 57fa56fa0..a4ebb963f 100644 --- a/env/users-api.env +++ b/env/users-api.env @@ -1,13 +1,13 @@ NODE_ENV=production PORT=4000 -MONGO_URL=mongodb://mongo/users +MONGO_URL=mongodb://host.docker.internal:27017/users -GATEWAY_ENDPOINT=http://master-app-api:4100/graphql +GATEWAY_ENDPOINT=http://host.docker.internal:4100/graphql USERS_API_PRESHARED=users_key AUTH0_DOMAIN=superalgos.eu.auth0.com AUTH0_AUDIENCE=https://auth-dev.superalgos.org AUTH0_ISSUER=https://superalgos.eu.auth0.com/ -AUTH0_CALLBACK_URL=http://localhost/callback -AUTH0_LOGOUT_URL=http://localhost +AUTH0_CALLBACK_URL=http://host.docker.internal/callback +AUTH0_LOGOUT_URL=http://host.docker.internal diff --git a/env_linux/clones-api.env b/env_linux/clones-api.env index 1f1f720b3..df6a33eb3 100644 --- a/env_linux/clones-api.env +++ b/env_linux/clones-api.env @@ -1,6 +1,8 @@ NODE_ENV=production PORT=4003 +FULL_LOG=false + # Database configuration MONGO_URL=mongodb://mongo/operations @@ -14,11 +16,11 @@ DEFAULT_BALANCE_ASSET_B=0.001 # Kubernetes configuration GATEWAY_ENDPOINT_K8S=http://localhost:4100/graphql -CLONE_EXECUTOR_IMAGE=superalgos/clone-executor:1.0.30 +CLONE_EXECUTOR_IMAGE=superalgos/clone-executor:1.0.33 CLUSTER_SERVER=https://kubernetes:16443 CLUSTER_NAME=microk8s-cluster -CERTIFICATE_AUTHORITY_DATA= +CERTIFICATE_AUTHORITY_DATA=LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMvakNDQWVhZ0F3SUJBZ0lKQU5LRmNnK2hiS0xpTUEwR0NTcUdTSWIzRFFFQkN3VUFNQlF4RWpBUUJnTlYKQkFNTUNURXlOeTR3TGpBdU1UQWVGdzB4T1RBMk1qQXhNak0yTURSYUZ3MDBOakV4TURVeE1qTTJNRFJhTUJReApFakFRQmdOVkJBTU1DVEV5Tnk0d0xqQXVNVENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DCmdnRUJBTXBTSFhlZjFZSTRJR1UyeUlNNVM4THRxWTMxNklQczVnNGxORVlCV0wrME1mMXhBRURHRU0vaW4reTAKMkZ0QUFKWnhybWZ3UEpSTVozQ2tMMysxTnJxVjFtQW1wRkE5cDcxZXlOYmpuMmk2N0Y0N2MyeldGNlBTc0ZlYwowVUlmRklWaE9wWmgvUTN0WUQvZlQveEJlOTE2Wmd2eVY0TThCL1BGY2xKbWUyM1VTMHB3RGZObFpmc2FsQzhpCkVCc2pQYURrMThucng2bDVZTWF4UENyNHRnSWc2WENvQm9wS1l5UzNpZUtSSzh2Qnhyb3drN1pHWWJMUm1udHUKZUU4b1Z5RXpsUGVrNkJYQm1JRVp3MmJMeTNKeG42b3IyWmlZMEcrekRZKzYwN2dsaFVyNnhEM0QxUHUzMnozNQo0SldlbkJTem5wVjMvTDk0aUVFMEpsdG9xS3NDQXdFQUFhTlRNRkV3SFFZRFZSME9CQllFRkRERzhjUG5iZmIyCnd2cXBXSzdEYzlpckt3RnpNQjhHQTFVZEl3UVlNQmFBRkRERzhjUG5iZmIyd3ZxcFdLN0RjOWlyS3dGek1BOEcKQTFVZEV3RUIvd1FGTUFNQkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBS1Bwclp6bnhaZEtuUUc1U3duSgpwWDBsditNNFF0R04zMDZwamxycTFtbWY2WXEwRDl5bEZ2WFRmNUtTWXZ0VGNaenorV1lReGNrc1JtUkIvOERjCjZnQ2hLSHFsV1NIV3FHcU94T1RQVFYvYktOd0NmY1BmaS81YzlFd0NtdjBndlA1Y0MxaTdWMUMxSEoxN0UwY0EKSzVEdytJMFd0Ky9kRWJXdnVhRStmcDBKT3hsdllMUGdkZlBoTnliL2lScDYzdHJudEhjdy9MOTEyM2xpMHF1aQo2VUJUZzFFYnR1VDZSVitsK2d5NkIvaENERG9IaUJRdnM3VmNqVXNaN1ZNUlpkckdlY0U5R3Q5Nkx2N0tNZ2lNCmQ4eFZXVGg5MnArU2lEem1vNnY1WVFvTHNqU25jK1NMK09jN2JsODRVSTFTNk1CVExSa0tRb0d6L0tPLzNrRkUKT08wPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== CONTEXT_NAME=microk8s-cluster USER_NAME=admin -USER_PASSWORD= +USER_PASSWORD=MGJmZDhZd3RnaGNyc3NqNGZZd3o1NzczazRJMnBtUWhuNGRvRXdIZXdvMD0K diff --git a/env_linux/master-app-api.env b/env_linux/master-app-api.env index 968b002c1..90a88b952 100644 --- a/env_linux/master-app-api.env +++ b/env_linux/master-app-api.env @@ -9,7 +9,7 @@ STRATEGIZER_API_PRESHARED=strategizer_keys COCKPIT_API_PRESHARED=cockpit_key SAWEB_API_PRESHARED=saweb_key -GRAPHQL_API_URL=https://demo-api-dev.superalgos.org/graphql +GRAPHQL_API_URL=http://localhost:4100/graphql TEAMS_API_URL=http://teams-api:4001/graphql USERS_API_URL=http://users-api:4000/graphql @@ -25,9 +25,3 @@ SAWEB_API_URL=http://saweb-api:4004/graphql AUTH0_DOMAIN=superalgos.eu.auth0.com AUTH0_AUDIENCE=https://auth-local.superalgos.org AUTH0_ISSUER=https://superalgos.eu.auth0.com/ - -# Webproxy -VIRTUAL_HOST=demo-api-dev.superalgos.org -LETSENCRYPT_HOST=demo-api-dev.superalgos.org -LETSENCRYPT_EMAIL=ssl-certificates@advancedalgos.org -VIRTUAL_PORT=4100 diff --git a/env_linux/master-app.env b/env_linux/master-app.env index ce52ca1f1..5aab561cb 100644 --- a/env_linux/master-app.env +++ b/env_linux/master-app.env @@ -1,18 +1,13 @@ NODE_ENV=production PORT=3100 -PLATFORM_API_URL=https://demo-api-dev.superalgos.org/graphql -CANVAS_URL=https://demo-charts-dev.superalgos.org/ +PLATFORM_API_URL=http://localhost:4100/graphql +CANVAS_URL=http://localhost:4101/ AUTH0_DOMAIN=superalgos.eu.auth0.com AUTH0_AUDIENCE=https://auth-local.superalgos.org AUTH0_ISSUER=https://superalgos.eu.auth0.com/ AUTH0_CLIENTID=jfendNx2Vpa3LJa58x8lEmoPTG3nJV3B -AUTH0_CALLBACK_URL=https://demo-dev.superalgos.org/callback -AUTH0_LOGOUT_URL=https://demo-dev.superalgos.org/ +AUTH0_CALLBACK_URL=http://localhost:3100/callback +AUTH0_LOGOUT_URL=http://localhost:3100/ -# Webproxy -VIRTUAL_HOST=demo-dev.superalgos.org -LETSENCRYPT_HOST=demo-dev.superalgos.org -LETSENCRYPT_EMAIL=ssl-certificates@advancedalgos.org -VIRTUAL_PORT=3100 diff --git a/env_linux/saweb-api.env b/env_linux/saweb-api.env index 0f95ae708..fb40f4f9d 100644 --- a/env_linux/saweb-api.env +++ b/env_linux/saweb-api.env @@ -9,7 +9,7 @@ GATEWAY_ENDPOINT=http://master-app-api:4100/graphql PRESHARED_GATEWAY_KEY=saweb_key # The NODE_ENDPOINT is used at team creation and is where other components will search for the team -NODE_ENDPOINT=https://demo-api-dev.superalgos.org/ +NODE_ENDPOINT=http://localhost:4100/ # Storage Configuration STORAGE_PROVIDER=Minio diff --git a/env_linux/users-api.env b/env_linux/users-api.env index e883dc5eb..77024832e 100644 --- a/env_linux/users-api.env +++ b/env_linux/users-api.env @@ -9,5 +9,5 @@ USERS_API_PRESHARED=users_key AUTH0_DOMAIN=superalgos.eu.auth0.com AUTH0_AUDIENCE=https://auth-local.superalgos.org AUTH0_ISSUER=https://superalgos.eu.auth0.com/ -AUTH0_CALLBACK_URL=https://demo-dev.superalgos.org/callback -AUTH0_LOGOUT_URL=https://demo-dev.superalgos.org/ +AUTH0_CALLBACK_URL=https://localhost:3100/callback +AUTH0_LOGOUT_URL=https://localhost:3100/ diff --git a/server/src/app.js b/server/src/app.js index b00b26150..e40e13a0d 100644 --- a/server/src/app.js +++ b/server/src/app.js @@ -182,7 +182,7 @@ async function run () { headers: Object.assign( res.locals.userId ? { userId: res.locals.userId } : {}, req.headers.authorization ? { authorization: req.headers.authorization } : {}, - req.headers.access_token ? { access_token: req.headers.access_token } : {} + req.headers.keyvault ? { keyvault: req.headers.keyvault } : {} ) } return response diff --git a/server/src/createRemoteSchema.js b/server/src/createRemoteSchema.js index 05ea3023a..500eebeee 100644 --- a/server/src/createRemoteSchema.js +++ b/server/src/createRemoteSchema.js @@ -31,7 +31,7 @@ export const createRemoteSchema = async (uri, preshared_key) => { headers: { Authorization: previousContext.graphqlContext.headers.authorization ? previousContext.graphqlContext.headers.authorization : '', UserId: previousContext.graphqlContext.headers.userId ? previousContext.graphqlContext.headers.userId : '', - access_token: previousContext.graphqlContext.headers.access_token ? previousContext.graphqlContext.headers.access_token : '' + keyvault: previousContext.graphqlContext.headers.keyvault ? previousContext.graphqlContext.headers.keyvault : '' } } )