Skip to content

Commit

Permalink
Showing 5 changed files with 32 additions and 4 deletions.
1 change: 0 additions & 1 deletion apps/azkaban-gateway/src/app/auth/auth.controller.ts
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ import {
Controller,
Delete,
HttpException,
Logger,
Post,
Put,
Req,
7 changes: 7 additions & 0 deletions apps/azkaban-gateway/src/app/auth/auth.presenter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { TokenDAO } from '@azkaban/auth-infrastructure';

export function TokenPresenter(token: TokenDAO) {
delete token.user.activation_token;
delete token.user.password;
return token;
}
9 changes: 8 additions & 1 deletion apps/azkaban-gateway/src/app/auth/auth.service.ts
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ import {
RmqRecordBuilderHelper,
} from '@toxictoast/azkaban-broker-rabbitmq';
import { AuthDAO, TokenDAO } from '@azkaban/auth-infrastructure';
import { TokenPresenter } from './auth.presenter';

@Injectable()
export class AuthService {
@@ -28,7 +29,13 @@ export class AuthService {
username,
password,
});
return await this.client.send(AuthTopics.LOGIN, payload).toPromise();
return await this.client
.send(AuthTopics.LOGIN, payload)
.toPromise()
.then((res) => TokenPresenter(res))
.catch((error) => {
throw error;
});
}

async refresh(id: string): Promise<TokenDAO> {
7 changes: 7 additions & 0 deletions apps/azkaban-gateway/src/app/user/user.presenter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { UserDAO } from '@azkaban/user-infrastructure';

export function UserPresenter(user: UserDAO) {
delete user.password;
delete user.activation_token;
return user;
}
12 changes: 10 additions & 2 deletions apps/azkaban-gateway/src/app/user/user.service.ts
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ import { ClientProxy } from '@nestjs/microservices';
import { Nullable, Optional } from '@toxictoast/azkaban-base-types';
import { UserDAO } from '@azkaban/user-infrastructure';
import { CachingService } from '../core/caching.service';
import { UserPresenter } from './user.presenter';

@Injectable()
export class UserService {
@@ -25,7 +26,10 @@ export class UserService {
});
const data = await this.client
.send(UserTopics.LIST, payload)
.toPromise();
.toPromise()
.then((users) => {
return users.map((user) => UserPresenter(user));
});
await this.cachingService.setCache(cacheKey, data);
return data;
}
@@ -41,7 +45,11 @@ export class UserService {
});
const data = await this.client
.send(UserTopics.ID, payload)
.toPromise();
.toPromise()
.then((user) => UserPresenter(user))
.catch((error) => {
throw error;
});
await this.cachingService.setCache(cacheKey, data);
return data;
}

0 comments on commit 147e7b8

Please sign in to comment.