This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 8f4683d7 authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

Merge branch 'improvement/securing-artemis-token' into 'development'

Securing Artemis token

See merge request sharing/codeability-sharing-platform!101
parents 7d5db418 29765ab2
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
...@@ -19,6 +19,7 @@ services: ...@@ -19,6 +19,7 @@ services:
- SECURITY_OAUTH2_CLIENT_REGISTRATION_GITLABOIDC_CLIENTSECRET=${SECURITY_OAUTH2_CLIENT_REGISTRATION_GITLABOIDC_CLIENTSECRET} - SECURITY_OAUTH2_CLIENT_REGISTRATION_GITLABOIDC_CLIENTSECRET=${SECURITY_OAUTH2_CLIENT_REGISTRATION_GITLABOIDC_CLIENTSECRET}
- APPLICATION_GITLAB_GENERALACCESSTOKEN=${APPLICATION_GITLAB_GENERALACCESSTOKEN} - APPLICATION_GITLAB_GENERALACCESSTOKEN=${APPLICATION_GITLAB_GENERALACCESSTOKEN}
- APPLICATION_GITLAB_ADMINACCESSTOKEN=${APPLICATION_GITLAB_ADMINACCESSTOKEN} - APPLICATION_GITLAB_ADMINACCESSTOKEN=${APPLICATION_GITLAB_ADMINACCESSTOKEN}
- CONNECTOR_ARTEMIS_TOKEN=${CONNECTOR_ARTEMIS_TOKEN}
- gitBranch=${GIT_BRANCH} - gitBranch=${GIT_BRANCH}
- gitCommitId=${COMMIT_ID} - gitCommitId=${COMMIT_ID}
- gitCommitDate=${COMMIT_DATE} - gitCommitDate=${COMMIT_DATE}
......
...@@ -150,7 +150,7 @@ jhipster: ...@@ -150,7 +150,7 @@ jhipster:
application: application:
registeredConnectors: registeredConnectors:
- url: 'https://artemis.codeability.uibk.ac.at/api/sharing/config' - url: 'https://artemis.codeability.uibk.ac.at/api/sharing/config'
accessToken: 'notYet' accessToken: ${CONNECTOR_ARTEMIS_TOKEN}
registeredConnectorsCallBackURL: https://search.sharing-codeability.uibk.ac.at//api registeredConnectorsCallBackURL: https://search.sharing-codeability.uibk.ac.at//api
installationName: Sharing Plattform installationName: Sharing Plattform
# applicationName: Sharing Plattform # applicationName: Sharing Plattform
......
...@@ -145,7 +145,7 @@ jhipster: ...@@ -145,7 +145,7 @@ jhipster:
application: application:
registeredConnectors: registeredConnectors:
- url: 'https://artemis.codeability-austria.uibk.ac.at/api/sharing/config' - url: 'https://artemis.codeability-austria.uibk.ac.at/api/sharing/config'
accessToken: 'notYet' accessToken: ${CONNECTOR_ARTEMIS_TOKEN}
registeredConnectorsCallBackURL: https://dev-exchange.codeability-austria.uibk.ac.at/api registeredConnectorsCallBackURL: https://dev-exchange.codeability-austria.uibk.ac.at/api
installationName: Sharing Plattform (Staging) installationName: Sharing Plattform (Staging)
gitlab: gitlab:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment