CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(self-service): update API to leverage current HTTP interceptors (#124)

Browse Source 
Update API for self service user management to leverage current HTTP interceptors for setting the API prefix and request headers.

Fixes #123
This commit is contained in:
Abhay Chawla
2018-07-14 21:14:55 +05:30
committed by GitHub
parent d9c35b8759
commit a57846b88b
3 changed files with 23 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/core/authentication/authentication.service.ts
+9 -15
View File
@@ -92,16 +92,13 @@ export class AuthenticationService {
this.storage = this.rememberMe ? localStorage : sessionStorage;
if (environment.oauth.enabled) {
return this.http.disableApiPrefix().post(
`${environment.oauth.serverUrl}
/oauth/token?username=${loginContext.username}&password=${loginContext.password}
&client_id=community-app&grant_type=password&client_secret=123`, {}
).pipe(
map((tokenResponse: OAuth2Token) => {
this.getUserDetails(tokenResponse);
return of(true);
})
);
return this.http.disableApiPrefix().post(`${environment.oauth.serverUrl}/oauth/token?username=${loginContext.username}&password=${loginContext.password}&client_id=community-app&grant_type=password&client_secret=123`, {})
.pipe(
map((tokenResponse: OAuth2Token) => {
this.getUserDetails(tokenResponse);
return of(true);
})
);
} else {
return this.http.post(`/authentication?username=${loginContext.username}&password=${loginContext.password}`, {})
.pipe(
@@ -131,11 +128,8 @@ export class AuthenticationService {
refreshOAuthAccessToken() {
const oAuthRefreshToken = JSON.parse(this.storage.getItem(oAuthTokenDetailsStorageKey)).refresh_token;
this.authenticationInterceptor.removeAuthorization();
this.http.disableApiPrefix().post(
`${environment.oauth.serverUrl}
/oauth/token?client_id=community-app&grant_type=refresh_token&client_secret=123
&refresh_token=${oAuthRefreshToken}`, {}
).subscribe((tokenResponse: OAuth2Token) => {
this.http.disableApiPrefix().post(`${environment.oauth.serverUrl}/oauth/token?client_id=community-app&grant_type=refresh_token&client_secret=123&refresh_token=${oAuthRefreshToken}`, {})
.subscribe((tokenResponse: OAuth2Token) => {
this.storage.setItem(oAuthTokenDetailsStorageKey, JSON.stringify(tokenResponse));
this.authenticationInterceptor.setAuthorizationToken(tokenResponse.access_token);
this.refreshTokenOnExpiry(tokenResponse.expires_in);