MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Prevent login requests to be sent multiple times from the oauth2 dialog

This commit is contained in:
George Kalampokis 2020-10-27 12:31:45 +02:00
parent 22cc8bb3a3
commit eeca52d3ff
3 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dmp-frontend/src/app/ui/auth/login/login.component.ts
View File

@ -40,6 +40,7 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
private orcidUser: OrcidUser; private orcidUser: OrcidUser;
private zenodoToken: ZenodoToken; private zenodoToken: ZenodoToken;
private accessToken: string; private accessToken: string;
private oauthLock: boolean;
//public cofigurableProviders: ConfigurableProvider[]; //public cofigurableProviders: ConfigurableProvider[];
constructor( constructor(
@ -77,7 +78,12 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
this.oauth2DialogService.login(this.getLinkedInUrl()).pipe(takeUntil(this._destroyed)) this.oauth2DialogService.login(this.getLinkedInUrl()).pipe(takeUntil(this._destroyed))
.subscribe(result => { .subscribe(result => {
if (result !== undefined) { if (result !== undefined) {
if (!this.oauthLock) {
this.linkedInLoginUser(result.oauthCode, result.oauthState); this.linkedInLoginUser(result.oauthCode, result.oauthState);
this.oauthLock = true;
}
} else {
this.oauthLock = false;
} }
}); });
} }
@ -89,7 +95,12 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
this.oauth2DialogService.login(url).pipe(takeUntil(this._destroyed)) this.oauth2DialogService.login(url).pipe(takeUntil(this._destroyed))
.subscribe(result => { .subscribe(result => {
if (result !== undefined) { if (result !== undefined) {
if (!this.oauthLock) {
this.twitterLoginUser(result.oauthToken, result.oauthVerifier); this.twitterLoginUser(result.oauthToken, result.oauthVerifier);
this.oauthLock = true;
}
} else {
this.oauthLock = false;
} }
}); });
} }
@ -102,7 +113,12 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
this.oauth2DialogService.login(this.getB2AccessUrl()).pipe(takeUntil(this._destroyed)) this.oauth2DialogService.login(this.getB2AccessUrl()).pipe(takeUntil(this._destroyed))
.subscribe(result => { .subscribe(result => {
if (result !== undefined) { if (result !== undefined) {
if (!this.oauthLock) {
this.b2AccessLoginUser(result.oauthCode); this.b2AccessLoginUser(result.oauthCode);
this.oauthLock = true;
}
} else {
this.oauthLock = false;
} }
}); });
} }
@ -112,7 +128,12 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
this.oauth2DialogService.login(this.getORCIDUrl()).pipe(takeUntil(this._destroyed)) this.oauth2DialogService.login(this.getORCIDUrl()).pipe(takeUntil(this._destroyed))
.subscribe(result => { .subscribe(result => {
if (result !== undefined) { if (result !== undefined) {
if (!this.oauthLock) {
this.orcidLoginUser(result.oauthCode); this.orcidLoginUser(result.oauthCode);
this.oauthLock = true;
}
} else {
this.oauthLock = false;
} }
}); });
} }
@ -122,7 +143,12 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
this.oauth2DialogService.login(this.getOpenAireUrl()).pipe(takeUntil(this._destroyed)) this.oauth2DialogService.login(this.getOpenAireUrl()).pipe(takeUntil(this._destroyed))
.subscribe(result => { .subscribe(result => {
if (result !== undefined) { if (result !== undefined) {
if (!this.oauthLock) {
this.openaireLoginUser(result.oauthCode, result.oauthState); this.openaireLoginUser(result.oauthCode, result.oauthState);
this.oauthLock = true;
}
} else {
this.oauthLock = false;
} }
}); });
} }
@ -136,7 +162,12 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
this.oauth2DialogService.login(this.getZenodoUrl()).pipe(takeUntil(this._destroyed)) this.oauth2DialogService.login(this.getZenodoUrl()).pipe(takeUntil(this._destroyed))
.subscribe(result => { .subscribe(result => {
if (result !== undefined) { if (result !== undefined) {
if (!this.oauthLock) {
this.zenodoLoginUser(result.oauthCode); this.zenodoLoginUser(result.oauthCode);
this.oauthLock = true;
}
} else {
this.oauthLock = false;
} }
}); });
} }

6
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
View File

@ -68,6 +68,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
textMessage: any; textMessage: any;
versions: VersionListingModel[]; versions: VersionListingModel[];
version: VersionListingModel; version: VersionListingModel;
private oauthLock: boolean;
@ViewChild('doi', { static: false }) @ViewChild('doi', { static: false })
doi: ElementRef; doi: ElementRef;
@ -528,14 +529,17 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
.pipe(takeUntil(this._destroyed)) .pipe(takeUntil(this._destroyed))
.subscribe(result => { .subscribe(result => {
if (result !== undefined) { if (result !== undefined) {
if (result.oauthCode !== undefined && result.oauthCode !== null) { if (result.oauthCode !== undefined && result.oauthCode !== null && !this.oauthLock) {
this.userService.registerDOIToken(result.oauthCode, this.configurationService.app + 'oauth2') this.userService.registerDOIToken(result.oauthCode, this.configurationService.app + 'oauth2')
.pipe(takeUntil(this._destroyed)) .pipe(takeUntil(this._destroyed))
.subscribe(() => { .subscribe(() => {
this.hasDOIToken = true; this.hasDOIToken = true;
this.showConfirmationDOIDialog(dmp); this.showConfirmationDOIDialog(dmp);
}); });
this.oauthLock = true;
} }
} else {
this.oauthLock = false;
} }
}); });
} }

6
dmp-frontend/src/app/ui/user-profile/user-profile.component.ts
View File

@ -49,6 +49,7 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
zenodoEmail: String; zenodoEmail: String;
roleOrganizationEnum = RoleOrganizationType; roleOrganizationEnum = RoleOrganizationType;
authProviderEnum = AuthProvider; authProviderEnum = AuthProvider;
private oauthLock: boolean;
organisationsAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { organisationsAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = {
filterFn: this.filterOrganisations.bind(this), filterFn: this.filterOrganisations.bind(this),
@ -238,11 +239,14 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
.pipe(takeUntil(this._destroyed)) .pipe(takeUntil(this._destroyed))
.subscribe(result => { .subscribe(result => {
if (result !== undefined) { if (result !== undefined) {
if (result.oauthCode !== undefined && result.oauthCode !== null) { if (result.oauthCode !== undefined && result.oauthCode !== null && !this.oauthLock) {
this.userService.registerDOIToken(result.oauthCode, this.configurationService.app + 'oauth2') this.userService.registerDOIToken(result.oauthCode, this.configurationService.app + 'oauth2')
.pipe(takeUntil(this._destroyed)) .pipe(takeUntil(this._destroyed))
.subscribe(() => this.router.navigate(['/reload']).then(() => this.router.navigate(['/profile']))); .subscribe(() => this.router.navigate(['/reload']).then(() => this.router.navigate(['/profile'])));
this.oauthLock = true;
} }
} else {
this.oauthLock = false;
} }
}); });
} }