auth fix
This commit is contained in:
parent
b27fee6ece
commit
b0b98fe01d
@ -305,22 +305,22 @@ export class AuthService {
|
||||
// throw new BadRequestException("Invalid username or password")
|
||||
// }
|
||||
|
||||
if (access_token && refresh_token && userSession.length > 0) {
|
||||
// if (access_token && refresh_token && userSession.length > 0) {
|
||||
|
||||
const getSub: any = jwt.decode(refresh_token, { complete: true })
|
||||
// const getSub: any = jwt.decode(refresh_token, { complete: true })
|
||||
|
||||
const user: any = await this.getUserDetailsById(getSub?.payload.sub)
|
||||
// const user: any = await this.getUserDetailsById(getSub?.payload.sub)
|
||||
|
||||
if (user.email !== username) {
|
||||
throw new UnauthorizedException("Authentication failed")
|
||||
}
|
||||
// if (user.email !== username) {
|
||||
// throw new UnauthorizedException("Authentication failed")
|
||||
// }
|
||||
|
||||
let tokens = await this.getTokenFromRefreshToken(req);
|
||||
const decoded = jwt.decode(access_token, { complete: true });
|
||||
const email: any = (decoded && typeof decoded === 'object') ? (decoded as any).payload?.email : undefined;
|
||||
return { ...tokens, email, ApplicationName: ROLE }
|
||||
// let tokens = await this.getTokenFromRefreshToken(req);
|
||||
// const decoded = jwt.decode(access_token, { complete: true });
|
||||
// const email: any = (decoded && typeof decoded === 'object') ? (decoded as any).payload?.email : undefined;
|
||||
// return { ...tokens, email, ApplicationName: ROLE }
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
const response = await axios.post(this.TOKEN_URL, params, {
|
||||
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
|
||||
@ -37,7 +37,7 @@ export class RolesGuard implements CanActivate {
|
||||
try {
|
||||
const decoded: any = jwt.decode(token);
|
||||
|
||||
const roles: string[] = decoded?.resource_access?.['carnet-app']?.roles || [];
|
||||
const roles: string[] = decoded?.resource_access?.[process.env.CLIENT_ID || '']?.roles || [];
|
||||
const hasRole = requiredRoles.some(role => roles.includes(role));
|
||||
|
||||
if (!hasRole) {
|
||||
|
||||
@ -20,7 +20,12 @@ async function bootstrap() {
|
||||
'http://localhost:5173',
|
||||
'https://policy.alphaomegainfosys.com',
|
||||
'https://sp.alphaomegainfosys.com',
|
||||
'https://client.alphaomegainfosys.com'
|
||||
'https://policy-2.alphaomegainfosys.com',
|
||||
'https://client-2.alphaomegainfosys.com',
|
||||
'https://sp-2.alphaomegainfosys.com',
|
||||
'https://policy-1.alphaomegainfosys.com',
|
||||
'https://client-1.alphaomegainfosys.com',
|
||||
'https://sp-1.alphaomegainfosys.com',
|
||||
],
|
||||
methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
|
||||
preflightContinue: false,
|
||||
|
||||
@ -436,7 +436,7 @@ export class ManageClientsService {
|
||||
const pgArrayLiteral = `{${addressLiterals.join(',')}}`;
|
||||
|
||||
const callProcQuery = `
|
||||
CALL "CARNETSYS".managepreparer_pkg_updateclientlocations($1, $2, $3::"CARNETSYS".addresstable[], $4, $5)
|
||||
CALL "CARNETSYS".managepreparer_pkg_createclientlocation($1, $2, $3::"CARNETSYS".addresstable[], $4, $5)
|
||||
`;
|
||||
await client.query(callProcQuery,
|
||||
[
|
||||
@ -515,7 +515,7 @@ export class ManageClientsService {
|
||||
await client.query('BEGIN');
|
||||
|
||||
const callProcQuery = `
|
||||
CALL "CARNETSYS".managepreparer_pkg_getpreparerlocbyclientid($1, $2, $3)
|
||||
CALL "CARNETSYS".managepreparer_pkg_GetPreparerByClientid($1, $2, $3)
|
||||
`;
|
||||
await client.query(callProcQuery, [body.P_SPID, body.P_CLIENTID, cursorName]);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user