Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/fxa-auth-server/lib/oauth/grant.js
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ exports.generateAccessToken = async function generateAccessToken(grant) {
}

if (grant.scope.contains('profile:subscriptions')) {
console.log('test this');
const capabilities =
await capabilityService.determineClientVisibleSubscriptionCapabilities(
clientId,
Expand Down
8 changes: 4 additions & 4 deletions packages/fxa-auth-server/lib/routes/account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1911,6 +1911,7 @@ export class AccountHandler {
) {
const capabilities =
await this.capabilityService.subscriptionCapabilities(uid as string);
console.log('here we go');
if (Object.keys(capabilities).length > 0) {
res.subscriptionsByClientId = capabilities;
}
Expand Down Expand Up @@ -2323,13 +2324,13 @@ export class AccountHandler {
return response;
}

async getEmails (request: AuthRequest) {
async getEmails(request: AuthRequest) {
this.log.begin('Account.emails', request);
const sessionToken = request.auth.credentials as { uid: string };
const account = await this.db.account(sessionToken.uid);
const result = {
originalEmail: account.email,
primaryEmail: account.primaryEmail?.email || account.email
primaryEmail: account.primaryEmail?.email || account.email,
};
return result;
}
Expand Down Expand Up @@ -3260,8 +3261,7 @@ export const accountRoutes = (
}),
},
},
handler: (request: AuthRequest) =>
accountHandler.getEmails(request),
handler: (request: AuthRequest) => accountHandler.getEmails(request),
},
{
method: 'POST',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,7 @@ describe.each(testVersions)(
});

it('should not include subscriptions with session token', async () => {
console.log('testing the test');
const response = await client.accountProfile();
expect(response.subscriptions).toBeUndefined();
});
Expand Down