Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

# caches yarn dependencies in the yarn cache (not npm_modules)
# should help to speed up yarn install and be safe
# across changes to the repo and platforms
- name: Cache Yarn Deps
uses: c-hive/gha-yarn-cache@v1
# caches yarn dependencies in the yarn cache (not npm_modules)
# should help to speed up yarn install and be safe
# across changes to the repo and platforms
cache: 'yarn'

- run: echo "github.ref = ${{ github.ref }}"

Expand Down Expand Up @@ -60,7 +58,7 @@ jobs:
- name: Build App Image
run: |
cd docker
docker-compose build
docker compose build

- name: Push App Images
run: |
Expand All @@ -85,9 +83,7 @@ jobs:
with:
node-version: 18
registry-url: https://registry.npmjs.org/

- name: Cache Yarn Deps
uses: c-hive/gha-yarn-cache@v1
cache: 'yarn'

# frozen lockfile should make the cache more effective
# and our tests more predictable
Expand Down
2 changes: 1 addition & 1 deletion packages/app/obojobo-express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"ejs": "^3.1.6",
"eventemitter": "^0.3.3",
"express": "~4.18.2",
"express-ims-lti": "https://github.com/ucfcdl/express-ims-lti.git#879f752758250b81429f75f62bb5602f1b06a564",
"express-ims-lti": "https://github.com/ucfcdl/express-ims-lti.git#d2eb98631b89cf9356e0053eeb0944d4f3dd4849",
"express-session": "^1.17.1",
"express-validator": "^6.10.0",
"file-type": "^16.3.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/obonode/obojobo-chunks-materia/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
"singleQuote": true
},
"dependencies": {
"jsonwebtoken": "^9.0.2",
"node-jose": "^2.2.0",
"oauth-signature": "^1.5.0",
"simple-oauth2": "^5.1.0",
"uuid": "^8.3.2",
"xml2js": "0.5.0"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,35 @@
{
"default":
{
"materiaLtiVersion": "1.3",
"oauthKey": "materia-lti-key",
"oauthSecret": "materia-lti-secret",
"oboFamilyCode": "obojobo-next",
"oboName": "Obojobo Next",
"oboGuid": "obojobo.next.default.guid"
"oboGuid": "obojobo.next.default.guid",
"oboJwtKey": "obojobo-jwt-key",
"oboLtiClientId": "1234",
"oboLtiUuid": "00000000-0000-0000-0000-000000000000",
"oboLtiDeploymentId": "obojobo-deploy-id",
"oboName": "Obojobo Next"
},
"development": {
"clientMateriaHost": "https://localhost",
"optionalOboServerHost": "https://host.docker.internal:8080",
"oboGuid": "obojobo.next.local.dev"
"clientMateriaHost": "http://localhost:420",
"materiaLtiVersion": {"ENV": "MATERIA_LTI_VERSION"},
"oboGuid": "obojobo.next.local.dev.guid",
"oboLtiUuid": "00000000-0000-0000-0000-000000000000",
"oboPrivateRsaKey": {"ENV": "OBO_PRIVATE_RSA_KEY"},
"optionalOboServerHost": "https://host.docker.internal:8080"
},
"production": {
"clientMateriaHost": {"ENV": "MATERIA_HOST"},
"materiaLtiVersion": {"ENV": "MATERIA_LTI_VERSION"},
"oauthKey": {"ENV": "MATERIA_OAUTH_KEY"},
"oauthSecret": {"ENV": "MATERIA_OAUTH_SECRET"},
"clientMateriaHost": {"ENV": "MATERIA_HOST"},
"oboGuid": {"ENV": "OBO_LTI_GUID"}
"oboGuid": {"ENV": "OBO_LTI_GUID"},
"oboJwtKey": {"ENV": "OBO_JWT_KEY"},
"oboLtiClientId": {"ENV": "OBO_LTI_CLIENTID"},
"oboLtiUuid": {"ENV": "OBO_LTI_UUID"},
"oboLtiDeploymentId": {"ENV": "OBO_LTI_DEPLOYMENTID"},
"oboPrivateRsaKey": {"ENV": "OBO_PRIVATE_RSA_KEY"}
}
}
Loading
Loading