From 20466bf69308b11d231ac90be154b4909447997d Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 13 Apr 2020 16:33:45 +0300
Subject: [PATCH] Improve and fixed zenodo account association

---
 .../src/main/java/eu/eudat/logic/managers/UserManager.java   | 2 ++
 .../ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts   | 2 +-
 .../src/app/ui/user-profile/user-profile.component.html      | 4 ++--
 .../src/app/ui/user-profile/user-profile.component.scss      | 5 +++++
 4 files changed, 10 insertions(+), 3 deletions(-)

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 5573898a2..dd47937b0 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
@@ -132,7 +132,9 @@ public class UserManager {
 			}
 			try {
 				this.updateDOIToken(ZenodoAccessType.REFRESH_TOKEN, principal.getZenodoRefresh(), this.environment.getProperty("zenodo.login.redirect_uri"), principal);
+				return true;
 			}catch (IOException e) {
+				this.deleteDOIToken(principal);
 				throw new ExpiredTokenException("Zenodo Token is expired.");
 			}
 		}
diff --git a/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts b/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts
index 5fb27e334..14491196b 100644
--- a/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts
+++ b/dmp-frontend/src/app/ui/misc/oauth2-dialog/service/oauth2-dialog.service.ts
@@ -19,7 +19,7 @@ export class Oauth2DialogService extends BaseService{
 	}
 
 	public login(url: string): Observable<string> {
-		const windows = window.open(this.configurationService.app + 'oauth2?url=' + encodeURIComponent(url) ,'', 'height=500px,width=500px');
+		const windows = window.open(this.configurationService.app + 'oauth2?url=' + encodeURIComponent(url) ,'', `height=500px,width=500px,top=${(window.screen.height / 2) - 200}px,left=${(window.screen.width / 2) - 200}px`);
 		const sub = interval(300).pipe(takeUntil(this._destroyed)).subscribe(() => {
 			if (windows.closed) {
 				const oauthCode = localStorage.getItem('oauthCode');
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.html b/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
index 3e8c2eddf..0dd345413 100644
--- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
+++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
@@ -110,12 +110,12 @@
 					<div class="container">
 						<div class="row">
 							<div class="col-md-4" *ngIf="!hasZenodo()">
-								<button mat-raised-button type="button" (click)="loginToZenodo()" class="confirm">{{'USER-PROFILE.ZENODO.LOGIN' | translate}}</button>
+								<button mat-raised-button type="button" (click)="loginToZenodo()" class="confirm" color="primary">{{'USER-PROFILE.ZENODO.LOGIN' | translate}}</button>
 							</div>
 							<div class="col-md-4" *ngIf="hasZenodo()">
 								<div><label class="zenodo-email">{{ 'USER-PROFILE.ZENODO.DESCRIPTION' | translate}}</label></div>
 								<label class="zenodo-email">{{zenodoEmail}}</label>
-								<div><button mat-raised-button type="button" (click)="RemoveZenodo()" class="confirm">{{'USER-PROFILE.ZENODO.LOGOUT' | translate}}</button></div>
+								<div><button mat-raised-button type="button" (click)="RemoveZenodo()" class="confirm unlinkBtn" >{{'USER-PROFILE.ZENODO.LOGOUT' | translate}}</button></div>
 							</div>
 						</div>
 					</div>
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
index fe59534bc..b96e9d794 100644
--- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
+++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
@@ -29,3 +29,8 @@
 .zenodo-email {
 	color: black;
 }
+
+.unlinkBtn {
+	background-color: FireBrick;
+	color: white;
+}