Skip to content

Commit

Permalink
refactor(tests): eliminate red code in tests, remove dead code
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerald Baulig committed Jun 19, 2024
1 parent ecf8116 commit 6449662
Show file tree
Hide file tree
Showing 3 changed files with 538 additions and 576 deletions.
39 changes: 2 additions & 37 deletions src/oauth_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export class OAuthService implements OAuthServiceImplementation<WithRequestID> {
redirect_uri: this.cfg.get('oauth:redirect_uri_base') + oauthService,
}, (err, access_token, refresh_token, result) => {
if (err) {
this.logger.error('Oauth failed:', { err });
reject(err);
return;
}
Expand All @@ -130,10 +131,7 @@ export class OAuthService implements OAuthServiceImplementation<WithRequestID> {
refresh_token,
result
});
})).catch(err => {
console.error(err);
throw err;
});
}));

const email = await accountResolvers[oauthService](data['access_token']);

Expand All @@ -156,43 +154,10 @@ export class OAuthService implements OAuthServiceImplementation<WithRequestID> {
}

const user = users.items[0].payload;

let tokenTechUser: any = {};
const techUsersCfg = this.cfg.get('techUsers');
if (techUsersCfg && techUsersCfg.length > 0) {
tokenTechUser = _.find(techUsersCfg, { id: 'upsert_user_tokens' });
}
tokenTechUser.scope = user.default_scope;

const resultTokens = (user.tokens || []).filter(t => {
return t.name === oauthService + '-access_token' || t.name === oauthService + '-refresh_token';
});

try {
const acsResponse = await checkAccessRequest(
{
...context,
subject: tokenTechUser,
resources: await createMetadata<any>(request, this.cfg.get('authorization:urns'), tokenTechUser)
},
[{ resource: 'token', id: context.id }], AuthZAction.MODIFY, Operation.isAllowed
);

if (acsResponse.decision != Response_Decision.PERMIT) {
return {
user: {
status: {
code: acsResponse.operation_status.code,
message: acsResponse.operation_status.message
}
}
};
}
} catch (err: any) {
this.logger.error('Error occurred requesting access-control-srv for token upsert', err);
return { user: { status: { code: err.code, message: err.message } } };
}

const userCopy = {
...user
};
Expand Down
Loading

0 comments on commit 6449662

Please sign in to comment.