ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5546 from FinnStutzenstein/checkForCookies

Browse Source 
Added missing client part for cookie checking on login
This commit is contained in:
Finn Stutzenstein 2020-10-08 09:17:02 +02:00 committed by GitHub
commit 12e6090fa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/app/core/core-services/auth.service.ts
View File

@ -10,6 +10,12 @@ import { HttpService } from './http.service';
import { OpenSlidesService } from './openslides.service'; import { OpenSlidesService } from './openslides.service';
import { StorageService } from './storage.service'; import { StorageService } from './storage.service';
interface LoginData {
username: string;
password: string;
cookies?: boolean;
}
/** /**
* Authenticates an OpenSlides user with username and password * Authenticates an OpenSlides user with username and password
*/ */
@ -47,11 +53,14 @@ export class AuthService {
earlySuccessCallback: () => void earlySuccessCallback: () => void
): Promise<void> { ): Promise<void> {
if (authType === 'default') { if (authType === 'default') {
const user = { const data: LoginData = {
username: username, username: username,
password: password password: password
}; };
const response = await this.http.post<WhoAmI>(environment.urlPrefix + '/users/login/', user); if (!navigator.cookieEnabled) {
data.cookies = false;
}
const response = await this.http.post<WhoAmI>(environment.urlPrefix + '/users/login/', data);
earlySuccessCallback(); earlySuccessCallback();
await this.OpenSlides.shutdown(); await this.OpenSlides.shutdown();
await this.operator.setWhoAmI(response); await this.operator.setWhoAmI(response);