Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge develop #254

Merged
merged 24 commits into from
Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f8ab3fe
fix: dapp connect issue (#219)
martines3000 May 26, 2023
496497d
chore: key did provider refactoring (#218)
tadejpodrekar May 30, 2023
14feb50
feat: OIDC apps and libs (#88)
martines3000 May 31, 2023
17d46e5
chore: fix docker build issue
martines3000 May 31, 2023
6b5efcf
chore: update dependencies (#220)
martines3000 Jun 2, 2023
bdb8f36
chore: add Masca logos without text to `assets` (#226)
pseudobun Jun 5, 2023
f299698
chore: update typescript to v5 (#225)
martines3000 Jun 5, 2023
65f4f3e
fix: fixes oidc deploy workflows (#224)
martines3000 Jun 5, 2023
3efbdb8
chore: issuer/verifier wokrflow files updated
martines3000 Jun 5, 2023
85c2a6f
chore: fix issuer/verifier dockerfiles
martines3000 Jun 5, 2023
5936eba
feat: add ecosystem page to dapp (#222)
andyv09 Jun 6, 2023
975d7ec
fix: runtime and ceramic issues (#229)
martines3000 Jun 6, 2023
2f54b5e
feat: Universal DID Resolver (#223)
andyv09 Jun 8, 2023
c3e01c4
chore: code refactor and improvements (#231)
martines3000 Jun 8, 2023
7415c09
chore: update oidc workflows (#240)
martines3000 Jun 12, 2023
f0c75a8
chore: replace sqlite lib (#241)
martines3000 Jun 12, 2023
3f86f7a
fix: move server urls to env file (#242)
martines3000 Jun 12, 2023
a67606a
fix: add verifyData rpc method to connector (#243)
andyv09 Jun 14, 2023
be5dce3
feat: nextjs app dir (#227)
martines3000 Jun 14, 2023
75cdf01
feat: did provider plugin template (#230)
pseudobun Jun 14, 2023
dc6f985
feat: implement ceramic session (#246)
andyv09 Jun 19, 2023
ef544cd
feat: did key provider publish config (#251)
martines3000 Jun 19, 2023
e0bef97
chore: release please config updates (#252)
martines3000 Jun 19, 2023
65d6802
chore: hide oidc links for now (#253)
martines3000 Jun 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ install-state.gz

# Don't ignore docs markdown files
!packages/docs/**/*.md
database.oidc-demo.issuer
database.oidc-demo.verifier
37 changes: 29 additions & 8 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {
'airbnb-typescript/base',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
'plugin:prettier/recommended',
'prettier',
],
overrides: [
{
Expand All @@ -21,9 +21,6 @@ module.exports = {
extends: ['plugin:jest/recommended', 'plugin:jest/style'],
rules: {
'jest/prefer-expect-assertions': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-unsafe-member-access': 'off',
},
env: { jest: true },
},
Expand All @@ -43,8 +40,15 @@ module.exports = {
'LabeledStatement',
'WithStatement',
],
'no-param-reassign': [2, { props: false }],
'no-await-in-loop': 'off',
'no-nested-ternary': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-unsafe-member-access': 'off',
'@typescript-eslint/no-unsafe-argument': 'off',
'@typescript-eslint/require-await': 'off',
// for unused-imports library

'@typescript-eslint/no-unused-vars': 'off',
'unused-imports/no-unused-imports': 'error',
'unused-imports/no-unused-vars': [
Expand All @@ -64,16 +68,32 @@ module.exports = {
'**/*.spec.ts',
'**/*.e2e-spec.ts',
'**/webpack.config.ts',
'**/test/**/*.ts',
'**/tests/**/*.ts',
'**/tsup.config.ts',
'**/jest.d.ts',
'**/test/**',
'**/tests/**',
],
},
],

// for prettier
'prettier/prettier': ['error', { singleQuote: true }],
'import/extensions': 'off',
},
overrides: [
{
// Disable in test files
files: [
'**/*.spec.ts',
'**/*.e2e-spec.ts',
'**/test/**/*.ts',
'**/tests/**/*.ts',
],
rules: {
'@typescript-eslint/no-unsafe-member-access': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
},
},
],
ignorePatterns: [
'**/node_modules/**',
'**/dist/**',
Expand All @@ -85,5 +105,6 @@ module.exports = {
'**/out',
'**/.next',
'tsup.config.ts',
'templates',
],
};
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@ concurrency:
jobs:
main:
name: Nx Cloud - Main Job
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.11.3
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
with:
pnpm-version: 7.30.0
node-version: 18.15.0
number-of-agents: 3
pnpm-version: 8.6.0
node-version: 18.16.0
number-of-agents: 4
main-branch-name: 'develop'
init-commands: |
pnpm nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=4
parallel-commands-on-agents: |
pnpm nx affected --target=lint --parallel=3
pnpm nx affected --target=test:ci --parallel=3
pnpm nx affected --target=build --parallel=3
pnpm exec nx affected --target=lint --parallel=4
pnpm exec nx affected --target=test:ci --parallel=4
pnpm exec nx affected --target=build --parallel=4

agents:
name: Nx Cloud - Agents
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.11.3
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
with:
number-of-agents: 3
pnpm-version: 7.30.0
node-version: 18.15.0
number-of-agents: 4
pnpm-version: 8.6.0
node-version: 18.16.0
61 changes: 61 additions & 0 deletions .github/workflows/deploy_issuer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Issuer deploy/build action

on:
workflow_dispatch:
pull_request:
branches: [develop]
types: [opened, synchronize, reopened]
paths:
- 'apps/oidc/issuer/**'
- 'Dockerfile'
- .github/workflows/deploy_issuer.yml
push:
branches: [develop]
paths:
- 'packages/oidc/issuer/**'
- 'Dockerfile'
- .github/workflows/deploy_issuer.yml

jobs:
deploy:
# Deploy when we PUSH to DEVELOP
if: ${{ (github.ref == 'refs/heads/develop') && (github.event_name == 'push') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Create nx-cloud.env
run: echo "NX_CLOUD_ACCESS_TOKEN=$NX_CLOUD_ACCESS_TOKEN" > nx-cloud.env
env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
- name: Build blockchain-lab-um/masca
run: docker build . -t blockchain-lab-um/masca
- name: Build blockchain-lab-um/issuer
run: docker build ./apps/oidc/issuer -t blockchain-lab-um/issuer
- name: Change image tag
run: docker tag blockchain-lab-um/issuer:latest bclabum.informatika.uni-mb.si/registry/issuer:latest
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
registry: bclabum.informatika.uni-mb.si/registry
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Push to private docker registry
run: docker push bclabum.informatika.uni-mb.si/registry/issuer:latest
test-build:
# Test build on every PR to DEVELOP
if: ${{ github.event_name == 'pull_request' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Create nx-cloud.env
run: echo "NX_CLOUD_ACCESS_TOKEN=$NX_CLOUD_ACCESS_TOKEN" > nx-cloud.env
env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
- name: Build blockchain-lab-um/masca
run: docker build . -t blockchain-lab-um/masca
- name: Build blockchain-lab-um/issuer
run: docker build ./apps/oidc/issuer -t blockchain-lab-um/issuer
61 changes: 61 additions & 0 deletions .github/workflows/deploy_verifier.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Verifier deploy/build action

on:
workflow_dispatch:
pull_request:
branches: [develop]
types: [opened, synchronize, reopened]
paths:
- 'apps/oidc/verifier/**'
- 'Dockerfile'
- .github/workflows/deploy_verifier.yml
push:
branches: [develop]
paths:
- 'packages/oidc/verifier/**'
- 'Dockerfile'
- .github/workflows/deploy_verifier.yml

jobs:
deploy:
# Deploy when we PUSH to DEVELOP
if: ${{ (github.ref == 'refs/heads/develop') && (github.event_name == 'push') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Create nx-cloud.env
run: echo "NX_CLOUD_ACCESS_TOKEN=$NX_CLOUD_ACCESS_TOKEN" > nx-cloud.env
env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
- name: Build blockchain-lab-um/masca
run: docker build . -t blockchain-lab-um/masca
- name: Build blockchain-lab-um/verifier
run: docker build ./apps/oidc/verifier -t blockchain-lab-um/verifier
- name: Change image tag
run: docker tag blockchain-lab-um/verifier:latest bclabum.informatika.uni-mb.si/registry/verifier:latest
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
registry: bclabum.informatika.uni-mb.si/registry
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Push to private docker registry
run: docker push bclabum.informatika.uni-mb.si/registry/verifier:latest
test-build:
# Test build on every PR to DEVELOP
if: ${{ github.event_name == 'pull_request' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Create nx-cloud.env
run: echo "NX_CLOUD_ACCESS_TOKEN=$NX_CLOUD_ACCESS_TOKEN" > nx-cloud.env
env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
- name: Build blockchain-lab-um/masca
run: docker build . -t blockchain-lab-um/masca
- name: Build blockchain-lab-um/verifier
run: docker build ./apps/oidc/verifier -t blockchain-lab-um/verifier
4 changes: 2 additions & 2 deletions .github/workflows/publish_core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 7.30.0
version: 8.6.0
- name: Install node
uses: actions/setup-node@v3
with:
node-version: 18.15.0
node-version: 18.16.0
registry-url: https://registry.npmjs.org/
cache: 'pnpm'
- name: Install deps
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_did_ebsi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 7.30.0
version: 8.6.0
- name: Install node
uses: actions/setup-node@v3
with:
node-version: 18.15.0
node-version: 18.16.0
registry-url: https://registry.npmjs.org/
cache: 'pnpm'
- name: Install deps
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/publish_did_key.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Publish KEY DID Provider

on:
workflow_dispatch:

jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.0
- name: Install node
uses: actions/setup-node@v3
with:
node-version: 18.16.0
registry-url: https://registry.npmjs.org/
cache: 'pnpm'
- name: Install deps
run: pnpm install --frozen-lockfile
- name: Build
run: pnpm release-build:did-provider-key
env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
- name: Publish
run: npm publish -w @blockchain-lab-um/did-provider-key
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}
4 changes: 2 additions & 2 deletions .github/workflows/publish_utils.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 7.30.0
version: 8.6.0
- name: Install node
uses: actions/setup-node@v3
with:
node-version: 18.15.0
node-version: 18.16.0
registry-url: https://registry.npmjs.org/
cache: 'pnpm'
- name: Install deps
Expand Down
Loading