hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-13 13:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added X-Requested-With header when retrieving auth methods on SSR

Browse Source
This commit is contained in:
Giuseppe Digilio
2020-01-16 15:17:59 +01:00
parent 6560d1d112
commit 4f8f4de241
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/core/auth/server-auth.service.ts
View File

@@ -10,7 +10,7 @@ import { isNotEmpty } from '../../shared/empty.util';
import { AuthService } from './auth.service';
import { AuthTokenInfo } from './models/auth-token-info.model';
import { EPerson } from '../eperson/models/eperson.model';
import { AuthMethod } from './models/auth.method';
import { NormalizedAuthStatus } from './models/normalized-auth-status.model';
/**
* The auth service.
@@ -45,6 +45,24 @@ export class ServerAuthService extends AuthService {
}));
}
/**
* Checks if token is present into the request cookie
*/
public checkAuthenticationCookie(): Observable<AuthStatus> {
// Determine if the user has an existing auth session on the server
const options: HttpOptions = Object.create({});
let headers = new HttpHeaders();
headers = headers.append('Accept', 'application/json');
if (isNotEmpty(this.req.headers) && isNotEmpty(this.req.headers.referer)) {
// use to allow the rest server to identify the real origin on SSR
headers = headers.append('X-Requested-With', this.req.headers.referer);
}
options.headers = headers;
return this.authRequestService.getRequest('status', options).pipe(
map((status: NormalizedAuthStatus) => Object.assign(new AuthStatus(), status))
);
}
/**
* Redirect to the route navigated before the login
*/
@@ -72,26 +90,4 @@ export class ServerAuthService extends AuthService {
})
}
/**
* Retrieve authentication methods available
* @returns {User}
*/
public retrieveAuthMethods(): Observable<AuthMethod[]> {
const options: HttpOptions = Object.create({});
if (isNotEmpty(this.req.headers) && isNotEmpty(this.req.headers.referer)) {
let headers = new HttpHeaders();
headers = headers.append('X-Requested-With', this.req.headers.referer);
options.headers = headers;
}
return this.authRequestService.postToEndpoint('login', {}, options).pipe(
map((status: AuthStatus) => {
let authMethods: AuthMethod[];
if (isNotEmpty(status.authMethods)) {
authMethods = status.authMethods;
}
return authMethods;
})
)
}
}