Skip to content

Commit

Permalink
Merge pull request #115 from nmshd/release/v5
Browse files Browse the repository at this point in the history
Release/v5
  • Loading branch information
jkoenig134 authored Aug 12, 2024
2 parents 3ae277e + bd2a968 commit f90e912
Show file tree
Hide file tree
Showing 304 changed files with 10,910 additions and 5,084 deletions.
9 changes: 9 additions & 0 deletions .dev/appsettings.override.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
}
}
}
},
"Application": {
"didDomainName": "localhost"
}
},
"Files": {
Expand All @@ -69,6 +72,9 @@
"Provider": "Postgres",
"ConnectionString": "User ID=messages;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;"
}
},
"Application": {
"didDomainName": "localhost"
}
},
"Relationships": {
Expand All @@ -77,6 +83,9 @@
"Provider": "Postgres",
"ConnectionString": "User ID=relationships;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;"
}
},
"Application": {
"didDomainName": "localhost"
}
},
"Synchronization": {
Expand Down
2 changes: 1 addition & 1 deletion .dev/compose.backbone.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
BACKBONE_VERSION=5.9.1
BACKBONE_VERSION=6.4.0
2 changes: 1 addition & 1 deletion .dev/compose.backbone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ services:
image: postgres
environment:
- PGPASSWORD=Passw0rd
command: /bin/bash -c 'env && apt update -y && apt install -y wget && wget https://raw.githubusercontent.com/nmshd/backbone/${BACKBONE_VERSION}/setup-db/setup-postgres.sql -O /setup-postgres.sql && psql -h postgres -U postgres -d enmeshed -f /setup-postgres.sql'
command: /bin/bash -c 'env && apt update -y && apt install -y wget && wget https://raw.githubusercontent.com/nmshd/backbone/${BACKBONE_VERSION}/scripts/sql/postgres/setup.sql -O /setup-postgres.sql && psql -h postgres -U postgres -d enmeshed -f /setup-postgres.sql'
depends_on:
database:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-prereleases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
registry-url: https://registry.npmjs.org/
- run: npm ci
- run: npm run build:ci -ws
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
registry-url: https://registry.npmjs.org/
- run: npm ci
- run: npm run build:ci -ws
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: npm run start:backbone
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- run: npm ci
- run: npm run build:node
- run: npm run test:ci --workspace=@nmshd/app-runtime
Expand All @@ -46,7 +46,7 @@ jobs:
run: npm run start:backbone
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- run: npm ci
- name: Start MongoDB
uses: supercharge/mongodb-github-action@v1
Expand All @@ -71,7 +71,7 @@ jobs:
run: npm run start:backbone
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- run: npm ci
- uses: js-soft/[email protected]
with:
Expand All @@ -93,7 +93,7 @@ jobs:
run: npm run start:backbone
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- run: npm ci
- run: npm run build:node
- run: npm run test:ci:lokijs --workspace=@nmshd/consumption
Expand All @@ -108,7 +108,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- run: npm ci
env:
BUILD_NUMBER: ${{ github.run_number }}
Expand All @@ -129,7 +129,7 @@ jobs:
run: npm run start:backbone
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- uses: supercharge/mongodb-github-action@v1
- run: npm ci
- run: npm run build:node
Expand All @@ -155,7 +155,7 @@ jobs:
run: npm run start:backbone
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- uses: js-soft/[email protected]
with:
ferretdb-telemetry: "enabled"
Expand All @@ -179,7 +179,7 @@ jobs:
run: npm run start:backbone
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- run: npm ci
- run: npm run build:node
- run: npm run build:schemas --workspace=@nmshd/runtime
Expand All @@ -198,7 +198,7 @@ jobs:
run: npm run start:backbone
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- run: npm ci
- run: npm run build:node
- name: Start MongoDB
Expand All @@ -224,7 +224,7 @@ jobs:
run: npm run start:backbone
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- run: npm ci
- run: npm run build:node
- uses: js-soft/[email protected]
Expand All @@ -247,7 +247,7 @@ jobs:
run: npm run start:backbone
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- run: npm ci
- run: npm run build:node
env:
Expand All @@ -266,7 +266,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: current
node-version: 22.4.1
- run: npm ci
- run: npm run build:node
env:
Expand Down
5 changes: 1 addition & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,8 @@
"xmlTools.splitAttributesOnFormat": true,
"xmlTools.enforcePrettySelfClosingTagOnFormat": true,
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
"source.organizeImports": "always"
},
"files.eol": "\n",
"typescript.unstable": {
"organizeImportsIgnoreCase": true
},
"typescript.tsdk": "node_modules/typescript/lib"
}
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"lint:prettier": "prettier --check .",
"lint:tsc": "npm run -ws lint:tsc",
"outdated": "ncu -i && ncu -i -ws",
"pull:backbone": "docker compose -p runtime-test-backbone --env-file .dev/compose.backbone.env -f .dev/compose.backbone.yml pull",
"start:backbone": "docker compose -p runtime-test-backbone --env-file .dev/compose.backbone.env -f .dev/compose.backbone.yml up -d",
"teardown:backbone": "docker compose -p runtime-test-backbone --env-file .dev/compose.backbone.env -f .dev/compose.backbone.yml down -v",
"test:teardown": "docker compose -f .dev/compose.yml down -fsv"
Expand Down
4 changes: 2 additions & 2 deletions packages/app-runtime/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nmshd/app-runtime",
"version": "3.3.0",
"version": "5.0.0",
"description": "The App Runtime",
"homepage": "https://enmeshed.eu",
"repository": {
Expand Down Expand Up @@ -63,7 +63,7 @@
"@types/luxon": "^3.4.2"
},
"peerDependencies": {
"@nmshd/runtime": "^4.11.0"
"@nmshd/runtime": "^5.0.0"
},
"publishConfig": {
"access": "public",
Expand Down
3 changes: 1 addition & 2 deletions packages/app-runtime/src/AppConfig.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { RuntimeConfig } from "@nmshd/runtime";
import { IConfigOverwrite, Realm } from "@nmshd/transport";
import { IConfigOverwrite } from "@nmshd/transport";
import { defaultsDeep } from "lodash";

export interface AppConfig extends RuntimeConfig {
Expand All @@ -23,7 +23,6 @@ export function createAppConfig(...configs: AppConfigOverwrite[]): AppConfig {
const appConfig = {
accountsDbName: "accounts",
transportLibrary: {
realm: Realm.Prod,
datawalletEnabled: true
},
modules: {
Expand Down
7 changes: 0 additions & 7 deletions packages/app-runtime/src/AppRuntimeErrors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@ class PushNotificationModule {
}
}

class MultiAccount {
public wrongRealm(): UserfriendlyApplicationError {
return new UserfriendlyApplicationError("error.runtime.MultiAccount.WrongRealm", "The given realm is invalid.");
}
}

class Modules {
public readonly pushNotificationModule = new PushNotificationModule();
}
Expand All @@ -97,5 +91,4 @@ export class AppRuntimeErrors {
public static readonly general = new General();
public static readonly startup = new Startup();
public static readonly modules = new Modules();
public static readonly multiAccount = new MultiAccount();
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { DataEvent, IdentityDVO, RelationshipChangeDTO, RelationshipDTO } from "@nmshd/runtime";
import { DataEvent, IdentityDVO, RelationshipAuditLogEntryDTO, RelationshipDTO } from "@nmshd/runtime";

export class OnboardingChangeReceivedEvent extends DataEvent<{
change: RelationshipChangeDTO;
relationship: RelationshipDTO;
auditLogEntry: RelationshipAuditLogEntryDTO;
identity: IdentityDVO;
}> {
public static readonly namespace: string = "app.onboardingChangeReceived";

public constructor(address: string, change: RelationshipChangeDTO, relationship: RelationshipDTO, identity: IdentityDVO) {
public constructor(address: string, relationship: RelationshipDTO, auditLogEntry: RelationshipAuditLogEntryDTO, identity: IdentityDVO) {
super(OnboardingChangeReceivedEvent.namespace, address, {
change,
relationship,
auditLogEntry,
identity
});
}
Expand Down
Loading

0 comments on commit f90e912

Please sign in to comment.