From 9674ec2b6bc285ff3b51593a391f40965b4c2a2f Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 26 Oct 2020 10:36:20 +0200
Subject: [PATCH] Add user merge related services and updates on existing
 services on the frontend

---
 .../eu/eudat/logic/managers/UserManager.java  |  2 +-
 .../core/model/merge/user-merge-request.ts    |  4 ++++
 .../app/core/model/user/user-credential.ts    |  6 +++++
 .../merge-email-confirmation.service.ts       | 23 +++++++++++++++++++
 .../app/core/services/user/user.service.ts    |  5 ++++
 5 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 dmp-frontend/src/app/core/model/merge/user-merge-request.ts
 create mode 100644 dmp-frontend/src/app/core/model/user/user-credential.ts
 create mode 100644 dmp-frontend/src/app/core/services/merge-email-confirmation/merge-email-confirmation.service.ts

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
index d1ba1f31d..7c3b6d942 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
@@ -94,7 +94,7 @@ public class UserManager {
 	public List<UserCredential> getCredentials(UUID userId) {
 		List<UserCredential> results = new ArrayList<>();
 		eu.eudat.data.entities.UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(userId);
-		List<Credential> credentials = apiContext.getOperationsContext().getDatabaseRepository().getCredentialDao().asQueryable().where((builder, root) -> builder.equal(root.get("userInfo").get("id"), userId)).toList();
+		List<Credential> credentials = apiContext.getOperationsContext().getDatabaseRepository().getCredentialDao().asQueryable().where((builder, root) -> builder.equal(root.get("userInfo"), user)).toList();
 		credentials.forEach(credential -> {
 			UserCredential userCredential = new UserCredential();
 			userCredential.setEmail(credential.getEmail());
diff --git a/dmp-frontend/src/app/core/model/merge/user-merge-request.ts b/dmp-frontend/src/app/core/model/merge/user-merge-request.ts
new file mode 100644
index 000000000..ef5c53d7f
--- /dev/null
+++ b/dmp-frontend/src/app/core/model/merge/user-merge-request.ts
@@ -0,0 +1,4 @@
+export class UserMergeRequestModel {
+	userId: String;
+	email: String;
+}
diff --git a/dmp-frontend/src/app/core/model/user/user-credential.ts b/dmp-frontend/src/app/core/model/user/user-credential.ts
new file mode 100644
index 000000000..fe716aea0
--- /dev/null
+++ b/dmp-frontend/src/app/core/model/user/user-credential.ts
@@ -0,0 +1,6 @@
+import { AuthProvider } from '@app/core/common/enum/auth-provider';
+
+export class UserCredentialModel {
+	email: string;
+	provider: AuthProvider;
+}
diff --git a/dmp-frontend/src/app/core/services/merge-email-confirmation/merge-email-confirmation.service.ts b/dmp-frontend/src/app/core/services/merge-email-confirmation/merge-email-confirmation.service.ts
new file mode 100644
index 000000000..0f3676932
--- /dev/null
+++ b/dmp-frontend/src/app/core/services/merge-email-confirmation/merge-email-confirmation.service.ts
@@ -0,0 +1,23 @@
+import { HttpHeaders } from '@angular/common/http';
+import { Injectable } from "@angular/core";
+import { BaseHttpService } from "../http/base-http.service";
+import { ConfigurationService } from '../configuration/configuration.service';
+import { UserMergeRequestModel } from '@app/core/model/merge/user-merge-request';
+
+@Injectable()
+export class MergeEmailConfirmationService {
+	private actioUrl: string;
+	private headers: HttpHeaders
+
+	constructor(private http: BaseHttpService, private configurationService: ConfigurationService) {
+		this.actioUrl = configurationService.server + 'emailMergeConfirmation/';
+	}
+
+	public emailConfirmation(token: string) {
+		return this.http.get<String>(this.actioUrl + token, { headers: this.headers });
+	}
+
+	public sendConfirmationEmail(mergeRequest: UserMergeRequestModel) {
+		return this.http.post<String>(this.actioUrl, mergeRequest, { headers: this.headers });
+	}
+}
diff --git a/dmp-frontend/src/app/core/services/user/user.service.ts b/dmp-frontend/src/app/core/services/user/user.service.ts
index 211706ca0..21d25d6c8 100644
--- a/dmp-frontend/src/app/core/services/user/user.service.ts
+++ b/dmp-frontend/src/app/core/services/user/user.service.ts
@@ -8,6 +8,7 @@ import { UserListingModel } from '../../model/user/user-listing';
 import { UserCriteria } from '../../query/user/user-criteria';
 import { BaseHttpService } from '../http/base-http.service';
 import { ConfigurationService } from '../configuration/configuration.service';
+import { UserCredentialModel } from '@app/core/model/user/user-credential';
 
 @Injectable()
 export class UserService {
@@ -28,6 +29,10 @@ export class UserService {
 		return this.http.get<UserListingModel>(this.actionUrl + id, { headers: this.headers });
 	}
 
+	getEmails(id: String): Observable<UserCredentialModel[]> {
+		return this.http.get<UserCredentialModel[]>(`${this.actionUrl}${id}/emails`, { headers: this.headers });
+	}
+
 	updateRoles(itemToUpdate: UserListingModel): Observable<UserListingModel> {
 		return this.http.post<UserListingModel>(this.actionUrl + 'updateRoles', JSON.stringify(itemToUpdate), { headers: this.headers });
 	}