v068

i4mi · May 14, 2024 · 238bdfe · 238bdfe
1 parent 2c3726e
commit 238bdfe
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/angular/package-lock.json b/angular/package-lock.json
diff --git a/angular/package.json b/angular/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mag-client",
- "version": "2.5.59",
+ "version": "2.5.68",
  "license": "MIT",
  "scripts": {
  "ng": "ng",

diff --git a/angular/src/app/mag/mag.component.ts b/angular/src/app/mag/mag.component.ts
@@ -569,13 +569,16 @@ export class MagComponent implements OnInit {
  authCodeFlowConfig.scope = `person_id=${this.targetIdentifier2Value}^^^&2.16.756.5.30.1.127.3.10.3&ISO purpose_of_use=urn:oid:2.16.756.5.30.1.127.3.10.5|NORM subject_role=urn:oid:2.16.756.5.30.1.127.3.10.6|HCP`;
  this.oauthService.configure(authCodeFlowConfig);
  this.oauthService.initCodeFlow();
- } else {
- if (this.authenticate.value === 'TCU') {
- this.getSamlToken().then((value) => (this.json = value));
- } else {
- this.oauthService.logOut();
- }
- }
+ } 
+ if (this.authenticate.value === 'Patient') {
+ let authCodeFlowConfig = this.fhirConfigService.getAuthCodeFlowConfig(this.provider.value);
+ authCodeFlowConfig.scope = `person_id=${this.targetIdentifier2Value}^^^&2.16.756.5.30.1.127.3.10.3&ISO purpose_of_use=urn:oid:2.16.756.5.30.1.127.3.10.5|NORM subject_role=urn:oid:2.16.756.5.30.1.127.3.10.6|PAT`;
+ this.oauthService.configure(authCodeFlowConfig);
+ this.oauthService.initCodeFlow(); 
+ } 
+ if (this.authenticate.value === 'TCU') {
+ this.getSamlToken().then((value) => (this.json = value));
+ } 
  }
 
  getAppcDocument(eprspid: string, uniqueId: string): string {
@@ -795,12 +798,7 @@ export class MagComponent implements OnInit {
  return Promise.resolve(this.oauthService.getAccessToken());
  }
  if (this.authenticate.value === 'Patient') {
- return Promise.resolve(
- this.getSimulatedSamlPmpAssertion(
- toLocaleDateTime(new Date()),
- this.targetIdentifier2Value
- )
- );
+ return Promise.resolve(this.oauthService.getAccessToken());
  }
  if (this.authenticate.value === 'TCU') {
  // const now = new Date();

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,4 +1,9 @@
-## To be released
+## 2024/05/15 v068
+- support for multiple IDP's [128](https://github.com/i4mi/MobileAccessGateway/issues/128)
+- reenable $find-medication-list
+- use IdP also for patient access in web app
+
+## 2024/05/08 v064
 
 - Added OAuth URLs to the CapabilityStatement [#135](https://github.com/i4mi/MobileAccessGateway/issues/135)
 - Implemented PPQm routes [#126](https://github.com/i4mi/MobileAccessGateway/issues/126)

diff --git a/src/main/java/ch/bfh/ti/i4mi/mag/mhd/pharm5/Pharm5RouteBuilder.java b/src/main/java/ch/bfh/ti/i4mi/mag/mhd/pharm5/Pharm5RouteBuilder.java
@@ -33,7 +33,7 @@
  */
 @Slf4j
 @Component
-@ConditionalOnProperty("mag.xds.pharm-1.url")
+@ConditionalOnProperty("mag.xds.pharm-5.url")
 class Pharm5RouteBuilder extends RouteBuilder {
 
  private final Config config;