Skip to content

Commit dcec8e5

Browse files
committed
fix(igx-ts): update the providers to fix build errors
1 parent 9b17452 commit dcec8e5

7 files changed

Lines changed: 23 additions & 19 deletions

File tree

packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/login-bar/login-bar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<button class="login-button" *ngIf="userService.currentUser" igxRipple="white" igxButton="flat" igxButtonBackground="c"
55
igxButtonColor="white" [igxToggleAction]="options">
66
<igx-avatar [initials]="userService.initials ?? ''" [src]="userService.currentUser.picture ?? ''"
7-
[roundShape]="true" size="small" bgColor="white">
7+
shape="circle" size="small" bgColor="white">
88
</igx-avatar>
99
<igx-icon>keyboard_arrow_down</igx-icon>
1010
</button>

packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/providers/auth-provider.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { ExternalLogin } from '../models/login';
22

33
export interface AuthProvider {
4-
config(): void;
54
login(): void;
65
getUserInfo(): Promise<ExternalLogin>;
76
logout(): void;

packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/providers/base-oidc-provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ export abstract class BaseOidcProvider implements AuthProvider {
3030
}
3131

3232
/** Format received user data per provider claims */
33-
protected abstract formatUserData(userData: { [key: string]: any; }): ExternalLogin;
33+
protected abstract formatUserData(userData: { [key: string]: any; }): Promise<ExternalLogin>;
3434
}

packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/providers/facebook-provider.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ export class FacebookProvider implements AuthProvider {
2727
'/me?fields=id,email,name,first_name,last_name,picture',
2828
(newResponse: { [key: string]: any; }) => {
2929
this.user = {
30-
id: newResponse.id,
31-
name: newResponse.name,
32-
given_name: newResponse.first_name,
33-
family_name: newResponse.last_name,
34-
email: newResponse.email,
35-
picture: newResponse.picture,
36-
externalToken: FB.getAuthResponse()[accessToken]
30+
id: newResponse['id'],
31+
name: newResponse['name'],
32+
given_name: newResponse['first_name'],
33+
family_name: newResponse['last_name'],
34+
email: newResponse['email'],
35+
picture: newResponse['picture'],
36+
externalToken: FB.getAuthResponse()?.[accessToken] ?? ''
3737
};
3838
this.router.navigate([this.externalStsConfig.redirect_url]);
3939
});
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { firstValueFrom } from 'rxjs';
12
import { ExternalLogin } from '../models/login';
23
import { BaseOidcProvider } from './base-oidc-provider';
34

@@ -7,16 +8,16 @@ export class GoogleProvider extends BaseOidcProvider {
78
* https://developers.google.com/identity/protocols/OpenIDConnect
89
* https://developers.google.com/+/web/api/rest/openidconnect/getOpenIdConnect
910
*/
10-
protected formatUserData(userData: { [key: string]: any; }): ExternalLogin {
11-
const login: ExternalLogin = {
11+
protected async formatUserData(userData: { [key: string]: any; }): Promise<ExternalLogin> {
12+
const token = await firstValueFrom(this.oidcSecurityService.getAccessToken(this.externalStsConfig.configId));
13+
return {
1214
id: userData['sub'],
1315
name: userData['name'],
1416
email: userData['email'],
1517
given_name: userData['given_name'],
1618
family_name: userData['family_name'],
1719
picture: userData['picture'],
18-
externalToken: this.oidcSecurityService.getAccessToken(this.externalStsConfig.configId)
20+
externalToken: token
1921
};
20-
return login;
2122
}
2223
}
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { firstValueFrom } from 'rxjs';
12
import { ExternalLogin } from '../models/login';
23
import { BaseOidcProvider } from './base-oidc-provider';
34

@@ -8,13 +9,13 @@ export class MicrosoftProvider extends BaseOidcProvider {
89
* Format user data response from available claims:
910
* https://docs.microsoft.com/en-us/azure/active-directory/develop/id-tokens#payload-claims
1011
*/
11-
protected formatUserData(userData: { [key: string]: any; }): ExternalLogin {
12-
const login: ExternalLogin = {
12+
protected async formatUserData(userData: { [key: string]: any; }): Promise<ExternalLogin> {
13+
const token = await firstValueFrom(this.oidcSecurityService.getAccessToken(this.externalStsConfig.configId));
14+
return {
1315
id: userData['oid'],
1416
name: userData['name'],
1517
email: userData['email'],
16-
externalToken: this.oidcSecurityService.getAccessToken(this.externalStsConfig.configId)
18+
externalToken: token
1719
};
18-
return login;
1920
}
2021
}

packages/igx-templates/igx-ts/projects/side-nav-auth/files/tsconfig.app.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
"facebook-js-sdk"
1313
]
1414
},
15+
"files": [
16+
"src/main.ts"
17+
],
1518
"include": [
16-
"src/**/*.ts"
19+
"src/**/*.d.ts"
1720
],
1821
"exclude": [
1922
"src/**/*.spec.ts"

0 commit comments

Comments
 (0)