paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 39 Packages Projects Releases Wiki Activity

auth-backend: refactor user profile fetch to transform profile outside

Browse Source
This commit is contained in:
Patrik Oldsberg
2021-02-13 17:42:14 +01:00
parent 10e59af4d0
commit b9709efff8
7 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
+4 -6
View File
@@ -190,19 +190,17 @@ type ProviderStrategy = {
export const executeFetchUserProfileStrategy = async (
providerStrategy: passport.Strategy,
accessToken: string,
idToken?: string,
): Promise<ProfileInfo> => {
): Promise<passport.Profile> => {
return new Promise((resolve, reject) => {
const anyStrategy = (providerStrategy as unknown) as ProviderStrategy;
anyStrategy.userProfile(
accessToken,
(error: Error, passportProfile: passport.Profile) => {
(error: Error, rawProfile: passport.Profile) => {
if (error) {
reject(error);
} else {
resolve(rawProfile);
}
const profile = makeProfileInfo(passportProfile, idToken);
resolve(profile);
},
);
});
plugins/auth-backend/src/providers/auth0/provider.ts
+2 -2
View File
@@ -114,11 +114,11 @@ export class Auth0AuthProvider implements OAuthHandlers {
req.scope,
);
const profile = await executeFetchUserProfileStrategy(
const rawProfile = await executeFetchUserProfileStrategy(
this._strategy,
accessToken,
params.id_token,
);
const profile = makeProfileInfo(rawProfile, params.id_token);
return this.populateIdentity({
providerInfo: {
plugins/auth-backend/src/providers/google/provider.ts
+2 -2
View File
@@ -127,11 +127,11 @@ export class GoogleAuthProvider implements OAuthHandlers {
req.scope,
);
const profile = await executeFetchUserProfileStrategy(
const rawProfile = await executeFetchUserProfileStrategy(
this._strategy,
accessToken,
params.id_token,
);
const profile = makeProfileInfo(rawProfile, params.id_token);
return this.populateIdentity({
providerInfo: {
plugins/auth-backend/src/providers/microsoft/provider.ts
+2 -2
View File
@@ -142,11 +142,11 @@ export class MicrosoftAuthProvider implements OAuthHandlers {
req.scope,
);
const profile = await executeFetchUserProfileStrategy(
const rawProfile = await executeFetchUserProfileStrategy(
this._strategy,
accessToken,
params.id_token,
);
const profile = makeProfileInfo(rawProfile, params.id_token);
const photo = await this.getUserPhoto(accessToken);
if (photo) {
profile.picture = photo;
plugins/auth-backend/src/providers/oauth2/provider.ts
+2 -2
View File
@@ -124,11 +124,11 @@ export class OAuth2AuthProvider implements OAuthHandlers {
refreshToken: updatedRefreshToken,
} = refreshTokenResponse;
const profile = await executeFetchUserProfileStrategy(
const rawProfile = await executeFetchUserProfileStrategy(
this._strategy,
accessToken,
params.id_token,
);
const profile = makeProfileInfo(rawProfile, params.id_token);
return this.populateIdentity({
providerInfo: {
plugins/auth-backend/src/providers/okta/provider.ts
+2 -2
View File
@@ -134,11 +134,11 @@ export class OktaAuthProvider implements OAuthHandlers {
req.scope,
);
const profile = await executeFetchUserProfileStrategy(
const rawProfile = await executeFetchUserProfileStrategy(
this._strategy,
accessToken,
params.id_token,
);
const profile = makeProfileInfo(rawProfile, params.id_token);
return this.populateIdentity({
providerInfo: {
plugins/auth-backend/src/providers/onelogin/provider.ts
+2 -2
View File
@@ -114,11 +114,11 @@ export class OneLoginProvider implements OAuthHandlers {
req.scope,
);
const profile = await executeFetchUserProfileStrategy(
const rawProfile = await executeFetchUserProfileStrategy(
this._strategy,
accessToken,
params.id_token,
);
const profile = makeProfileInfo(rawProfile, params.id_token);
return this.populateIdentity({
providerInfo: {