feat(apps): a sales expert can work inside their customer's account (D29)
Reported missing by the owner: in the reference an expert could open any
of their referred customers and use the app AS them — browse, see
balance and debt, place orders — «یکجورایی انگار با اکانت اون ها لاگین
کرده». D21 had deliberately left it out as a session-hijack primitive.
The owner asked for the capability back with the implementation left to
judgement, so the scope is the reference's and the mechanism is not.
Scope: everything, as the reference had it. Its axios interceptor
swapped the bearer token, so every request went as the customer,
document upload included. No route is closed in act-as mode.
Mechanism: the reference minted and handed over the customer's own
permanent api_token. Here the expert keeps their own token and sends
X-Act-As-Customer, resolved in one place — CustomerJwtStrategy
.validateExpert. That single point is why all 17 customer routes work
unchanged: validate() already returns a principal whose `id` is a
Customer id and every customer route reads it. It also fixes four real
defects of the original:
- ownership is re-checked on EVERY request, with referredByAgentId in
the same where clause as the id, so another expert's customer and a
non-existent id both answer 403, and a customer moved to another
expert loses access at once rather than at token expiry;
- nothing durable is handed out — the reference's token sat in
localStorage with no expiry and kept working after the expert left;
- adminUserId survives, so an order placed this way is attributable;
in the reference the request was literally the customer's;
- 403 rather than 401, so the app clears the act-as state instead of
logging a perfectly valid session out.
Performance: one findFirst on the primary key, only when the header is
present, and it replaces the trading-account lookup rather than adding
to it.
Three things the reference never needed, because it swapped the whole
session. queryCache's `me:` keys, favouritesStore and wageQuoteStore all
dropped their data on a TOKEN change, which act-as does not cause — so
an expert would have seen their own profile, orders, balance, ledger and
favourites inside the customer's account. The wage-quote one is the
money case: making charge is per customer, so the figure on screen would
not have been the one the order was priced at. And uploadDocument builds
its own headers, so an expert's upload would have been filed against
their own account, silently.
Added with no reference equivalent: a permanent «در حال مشاهده بهعنوان
…» bar. There, impersonation was invisible once the token had been
swapped, and placing an order on the wrong customer's gold debt was one
tap away. It is also the exit — the reference's only way out was a
logout that ended the expert's own session too. The cart is cleared in
both directions.
CustomerJwtStrategy had no test coverage at all and is now where this
feature's whole authorisation boundary lives: act-as-customer.spec.ts
covers 11 cases, including the header being ignored on a customer token,
the no-header path asserting the extra query does not run, and a revoked
session short-circuiting before the header is read.
api: 308/308 tests, 28 suites; both apps vue-tsc clean.
اپ: کارشناس فروش میتواند وارد حساب مشتریان خود شود، وضعیتشان را ببیند و از طرفشان سفارش ثبت کند.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
c518f9995b
commit
ddcc8c5649
@@ -0,0 +1,184 @@
|
||||
import { ForbiddenException, UnauthorizedException } from '@nestjs/common';
|
||||
import { AdminRole } from '@prisma/client';
|
||||
|
||||
// passport-jwt reads the secret at construction; give it something to find.
|
||||
process.env.JWT_CUSTOMER_SECRET = 'test-secret';
|
||||
|
||||
// @nestjs/jwt v12 is ESM only and this jest setup is CommonJS. The strategy
|
||||
// pulls it in transitively (customer-auth.service exports customerJwtSecret),
|
||||
// so it is stubbed here exactly as master-otp.spec.ts does.
|
||||
jest.mock('@nestjs/jwt', () => ({ JwtService: class {} }));
|
||||
|
||||
import { CustomerJwtStrategy } from './customer-jwt.strategy';
|
||||
import {
|
||||
ACT_AS_CUSTOMER_HEADER,
|
||||
CUSTOMER_TOKEN_TYPE,
|
||||
EXPERT_TOKEN_TYPE,
|
||||
} from './app-principal';
|
||||
|
||||
/**
|
||||
* «ورود به حساب مشتری» — a sales expert working inside one of their own
|
||||
* customers' accounts (owner request 2026-10-12).
|
||||
*
|
||||
* The reference did this by handing the expert the customer's own permanent
|
||||
* `api_token` (ApiMobileController.php:197-201), which meant the request was
|
||||
* literally the customer's: unauditable, valid forever, and still working after
|
||||
* the expert left. Here the expert keeps their own token and names the customer
|
||||
* in a header, and this strategy is the ONLY place that decides whether that is
|
||||
* allowed — so these cases are the whole security boundary of the feature.
|
||||
*
|
||||
* The strategy had no test coverage at all before this file.
|
||||
*/
|
||||
describe('CustomerJwtStrategy — a sales expert acting as their customer', () => {
|
||||
const EXPERT = {
|
||||
id: 'adm_1',
|
||||
mobile: '09120000001',
|
||||
role: AdminRole.SALES_EXPERT,
|
||||
isActive: true,
|
||||
salesExpertProfile: {
|
||||
tradingCustomerId: 'cus_trading',
|
||||
tradingCustomer: { id: 'cus_trading', isActive: true, isArchived: false },
|
||||
},
|
||||
};
|
||||
|
||||
/** The expert's own referred customer, as the scoped lookup would find them. */
|
||||
const MINE = { id: 'cus_mine', mobile: '09125555555' };
|
||||
|
||||
function build(opts: { admin?: unknown; scopedCustomer?: unknown; customer?: unknown } = {}) {
|
||||
const prisma = {
|
||||
adminUser: { findUnique: jest.fn().mockResolvedValue('admin' in opts ? opts.admin : EXPERT) },
|
||||
customer: {
|
||||
// The act-as lookup: id AND referredByAgentId in one where clause, so
|
||||
// "not mine" and "does not exist" are the same answer.
|
||||
findFirst: jest.fn().mockResolvedValue('scopedCustomer' in opts ? opts.scopedCustomer : MINE),
|
||||
findUnique: jest.fn().mockResolvedValue(
|
||||
'customer' in opts
|
||||
? opts.customer
|
||||
: { id: 'cus_1', mobile: '09121111111', isActive: true, isArchived: false },
|
||||
),
|
||||
},
|
||||
};
|
||||
// Session tracking off — isActive() answers true without a query.
|
||||
const sessions = { isActive: jest.fn().mockResolvedValue(true) };
|
||||
const strategy = new CustomerJwtStrategy(prisma as never, sessions as never);
|
||||
return { strategy, prisma };
|
||||
}
|
||||
|
||||
const req = (actAs?: string) =>
|
||||
({ headers: actAs === undefined ? {} : { [ACT_AS_CUSTOMER_HEADER]: actAs } }) as never;
|
||||
|
||||
const expertToken = { sub: 'adm_1', mobile: '09120000001', typ: EXPERT_TOKEN_TYPE } as never;
|
||||
const customerToken = { sub: 'cus_1', mobile: '09121111111', typ: CUSTOMER_TOKEN_TYPE } as never;
|
||||
|
||||
it('serves the customer as themselves, keeping the expert as the real actor', async () => {
|
||||
const { strategy } = build();
|
||||
const me = await strategy.validate(req('cus_mine'), expertToken);
|
||||
|
||||
// `id` is what every customer route reads — this is the whole feature.
|
||||
expect(me.id).toBe('cus_mine');
|
||||
expect(me.actingAsCustomerId).toBe('cus_mine');
|
||||
// The real actor is never lost, which is what the reference could not do.
|
||||
expect(me.adminUserId).toBe('adm_1');
|
||||
expect(me.type).toBe(EXPERT_TOKEN_TYPE);
|
||||
});
|
||||
|
||||
it('scopes the lookup to this expert in the query itself', async () => {
|
||||
const { strategy, prisma } = build();
|
||||
await strategy.validate(req('cus_mine'), expertToken);
|
||||
expect(prisma.customer.findFirst).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
where: expect.objectContaining({
|
||||
id: 'cus_mine',
|
||||
referredByAgentId: 'adm_1',
|
||||
isActive: true,
|
||||
isArchived: false,
|
||||
}),
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it("refuses another expert's customer with 403, not 401", async () => {
|
||||
// The scoped lookup finds nothing — same answer as a non-existent id, so an
|
||||
// id cannot be probed for existence.
|
||||
const { strategy } = build({ scopedCustomer: null });
|
||||
// 403 and not 401 on purpose: the expert's own session is fine, so the app
|
||||
// clears the act-as state rather than logging them out.
|
||||
await expect(strategy.validate(req('cus_someone_else'), expertToken)).rejects.toThrow(
|
||||
ForbiddenException,
|
||||
);
|
||||
});
|
||||
|
||||
it('refuses an inactive or archived customer', async () => {
|
||||
// isActive/isArchived are part of the same where clause, so this is the
|
||||
// identical "no row" path; asserted separately because it is a distinct
|
||||
// business case that must not quietly start working.
|
||||
const { strategy } = build({ scopedCustomer: null });
|
||||
await expect(strategy.validate(req('cus_disabled'), expertToken)).rejects.toThrow(
|
||||
ForbiddenException,
|
||||
);
|
||||
});
|
||||
|
||||
it('cuts the expert off immediately once they are deactivated', async () => {
|
||||
const { strategy } = build({ admin: { ...EXPERT, isActive: false } });
|
||||
await expect(strategy.validate(req('cus_mine'), expertToken)).rejects.toThrow(
|
||||
UnauthorizedException,
|
||||
);
|
||||
});
|
||||
|
||||
it('cuts them off immediately once they are no longer a sales expert', async () => {
|
||||
const { strategy } = build({ admin: { ...EXPERT, role: AdminRole.ACCOUNTANT } });
|
||||
await expect(strategy.validate(req('cus_mine'), expertToken)).rejects.toThrow(
|
||||
UnauthorizedException,
|
||||
);
|
||||
});
|
||||
|
||||
it('ignores the header on an ordinary customer token', async () => {
|
||||
// Not an error — simply no effect. A customer cannot grant themselves
|
||||
// anything by sending it, and there is nothing for them to discover.
|
||||
const { strategy, prisma } = build();
|
||||
const me = await strategy.validate(req('cus_mine'), customerToken);
|
||||
expect(me.id).toBe('cus_1');
|
||||
expect(me.actingAsCustomerId).toBeUndefined();
|
||||
expect(prisma.customer.findFirst).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('falls back to the trading account when no header is sent', async () => {
|
||||
const { strategy, prisma } = build();
|
||||
const me = await strategy.validate(req(), expertToken);
|
||||
expect(me.id).toBe('cus_trading');
|
||||
expect(me.actingAsCustomerId).toBeUndefined();
|
||||
// No extra query on the ordinary path — the act-as lookup never runs.
|
||||
expect(prisma.customer.findFirst).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('treats a blank or whitespace header as absent', async () => {
|
||||
const { strategy } = build();
|
||||
await expect(strategy.validate(req(' '), expertToken)).resolves.toMatchObject({
|
||||
id: 'cus_trading',
|
||||
});
|
||||
});
|
||||
|
||||
it('takes the first value when the header is sent twice', async () => {
|
||||
const { strategy, prisma } = build();
|
||||
const dup = { headers: { [ACT_AS_CUSTOMER_HEADER]: ['cus_mine', 'cus_other'] } } as never;
|
||||
await strategy.validate(dup, expertToken);
|
||||
expect(prisma.customer.findFirst).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ where: expect.objectContaining({ id: 'cus_mine' }) }),
|
||||
);
|
||||
});
|
||||
|
||||
it('refuses a revoked session before looking at the header at all', async () => {
|
||||
const prisma = {
|
||||
adminUser: { findUnique: jest.fn() },
|
||||
customer: { findFirst: jest.fn(), findUnique: jest.fn() },
|
||||
};
|
||||
const strategy = new CustomerJwtStrategy(
|
||||
prisma as never,
|
||||
{ isActive: jest.fn().mockResolvedValue(false) } as never,
|
||||
);
|
||||
await expect(strategy.validate(req('cus_mine'), expertToken)).rejects.toThrow(
|
||||
UnauthorizedException,
|
||||
);
|
||||
expect(prisma.adminUser.findUnique).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -54,13 +54,37 @@ export interface AppJwtPayload {
|
||||
* Customer.referredByAgentId points at the AdminUser, not at the trading row.
|
||||
*/
|
||||
export interface AuthenticatedCustomer {
|
||||
/** Customer id. For an expert, their own trading account. */
|
||||
/**
|
||||
* Customer id. For an expert: their own trading account, or — while acting as
|
||||
* one of their customers — that customer. Every customer route reads this, so
|
||||
* setting it here is what makes the whole app render from the customer's point
|
||||
* of view without touching a single route.
|
||||
*/
|
||||
id: string;
|
||||
mobile: string;
|
||||
/** Which kind of principal this is. */
|
||||
type: AppTokenType;
|
||||
/** The AdminUser id — present only for a sales expert. */
|
||||
adminUserId?: string;
|
||||
/**
|
||||
* Set only while a sales expert is acting as one of their referred customers
|
||||
* («ورود به حساب مشتری»). Equal to `id` when set.
|
||||
*
|
||||
* It exists so the real actor is never lost: `id` says whose data this is,
|
||||
* `adminUserId` says who is actually driving. The reference had no equivalent
|
||||
* — it handed the expert the customer's own `api_token`, so a request was
|
||||
* indistinguishable from the customer's own and nothing could be audited
|
||||
* afterwards.
|
||||
*/
|
||||
actingAsCustomerId?: string;
|
||||
}
|
||||
|
||||
/** The request header that asks to act as one of the expert's own customers. */
|
||||
export const ACT_AS_CUSTOMER_HEADER = 'x-act-as-customer';
|
||||
|
||||
/** True when this principal is a sales expert acting as one of their customers. */
|
||||
export function isActingAsCustomer(me: AuthenticatedCustomer): boolean {
|
||||
return Boolean(me.actingAsCustomerId);
|
||||
}
|
||||
|
||||
/** True when this principal is a sales expert. */
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
import { Injectable, UnauthorizedException } from '@nestjs/common';
|
||||
import { ForbiddenException, Injectable, UnauthorizedException } from '@nestjs/common';
|
||||
import { PassportStrategy } from '@nestjs/passport';
|
||||
import { AdminRole } from '@prisma/client';
|
||||
import type { Request } from 'express';
|
||||
import { ExtractJwt, Strategy } from 'passport-jwt';
|
||||
import { PrismaService } from '../../prisma/prisma.service';
|
||||
import { customerJwtSecret } from './customer-auth.service';
|
||||
import {
|
||||
ACT_AS_CUSTOMER_HEADER,
|
||||
CUSTOMER_TOKEN_TYPE,
|
||||
EXPERT_TOKEN_TYPE,
|
||||
type AppJwtPayload,
|
||||
@@ -13,8 +15,10 @@ import {
|
||||
import { AppSessionService } from '../sessions/app-session.service';
|
||||
|
||||
export {
|
||||
ACT_AS_CUSTOMER_HEADER,
|
||||
CUSTOMER_TOKEN_TYPE,
|
||||
EXPERT_TOKEN_TYPE,
|
||||
isActingAsCustomer,
|
||||
type AuthenticatedCustomer,
|
||||
} from './app-principal';
|
||||
|
||||
@@ -50,10 +54,13 @@ export class CustomerJwtStrategy extends PassportStrategy(Strategy, 'customer-jw
|
||||
jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
|
||||
ignoreExpiration: false,
|
||||
secretOrKey: customerJwtSecret(),
|
||||
// Needed only to read the act-as header; the token itself is still the
|
||||
// only thing that establishes WHO is calling.
|
||||
passReqToCallback: true,
|
||||
});
|
||||
}
|
||||
|
||||
async validate(payload: AppJwtPayload): Promise<AuthenticatedCustomer> {
|
||||
async validate(req: Request, payload: AppJwtPayload): Promise<AuthenticatedCustomer> {
|
||||
// نشست باطلشده (خروج سراسری از IdP یا ابطال محلی). در حالت خاموشِ ردیابی،
|
||||
// بدون هیچ کوئری true برمیگردد ⇒ هزینه و رفتار دقیقاً مثل قبل.
|
||||
if (!(await this.sessions.isActive(payload?.jti))) {
|
||||
@@ -61,7 +68,7 @@ export class CustomerJwtStrategy extends PassportStrategy(Strategy, 'customer-jw
|
||||
}
|
||||
|
||||
if (payload?.typ === EXPERT_TOKEN_TYPE) {
|
||||
return this.validateExpert(payload);
|
||||
return this.validateExpert(payload, this.actAsHeader(req));
|
||||
}
|
||||
|
||||
// A token that is not explicitly a customer token is refused, whatever
|
||||
@@ -84,6 +91,17 @@ export class CustomerJwtStrategy extends PassportStrategy(Strategy, 'customer-jw
|
||||
return { id: customer.id, mobile: customer.mobile, type: CUSTOMER_TOKEN_TYPE };
|
||||
}
|
||||
|
||||
/**
|
||||
* The act-as header, or null. Deliberately read ONLY for an expert token: on
|
||||
* a customer's token the header has no effect at all, rather than being an
|
||||
* error — a customer cannot grant themselves anything by sending it.
|
||||
*/
|
||||
private actAsHeader(req: Request): string | null {
|
||||
const raw = (req?.headers as Record<string, unknown> | undefined)?.[ACT_AS_CUSTOMER_HEADER];
|
||||
const value = Array.isArray(raw) ? raw[0] : raw;
|
||||
return typeof value === 'string' && value.trim() ? value.trim() : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* A sales expert. `sub` is their AdminUser id, so the role and active flag
|
||||
* are re-checked on every request: demoting an expert or deactivating them
|
||||
@@ -91,8 +109,28 @@ export class CustomerJwtStrategy extends PassportStrategy(Strategy, 'customer-jw
|
||||
*
|
||||
* The trading Customer row is resolved here rather than stored in the token,
|
||||
* so a token issued before that row existed keeps working.
|
||||
*
|
||||
* ACTING AS A CUSTOMER («ورود به حساب مشتری», owner request 2026-10-12)
|
||||
*
|
||||
* With `actAs` set, the returned principal's `id` is that customer, so every
|
||||
* customer route — orders, me, ledger, report, favourites, documents — serves
|
||||
* the customer's own data with no change to any route. That is the whole
|
||||
* feature, and it is why this is the only place the behaviour lives.
|
||||
*
|
||||
* How this differs from the reference, which did the same thing by handing the
|
||||
* expert the customer's own `api_token` (ApiMobileController.php:197-201):
|
||||
*
|
||||
* - no token is minted, so nothing durable leaks into a device's storage
|
||||
* and ending the app session ends the impersonation;
|
||||
* - ownership is re-checked on EVERY request, so moving a customer to
|
||||
* another expert cuts access off at once instead of at token expiry;
|
||||
* - `adminUserId` survives, so the real actor is auditable — in the
|
||||
* reference the request was indistinguishable from the customer's own.
|
||||
*/
|
||||
private async validateExpert(payload: AppJwtPayload): Promise<AuthenticatedCustomer> {
|
||||
private async validateExpert(
|
||||
payload: AppJwtPayload,
|
||||
actAs: string | null,
|
||||
): Promise<AuthenticatedCustomer> {
|
||||
const admin = await this.prisma.adminUser.findUnique({
|
||||
where: { id: payload.sub },
|
||||
select: {
|
||||
@@ -113,6 +151,36 @@ export class CustomerJwtStrategy extends PassportStrategy(Strategy, 'customer-jw
|
||||
throw new UnauthorizedException();
|
||||
}
|
||||
|
||||
if (actAs) {
|
||||
// Scoped by referredByAgentId in the same query as the id, so another
|
||||
// expert's customer and a non-existent id are the same answer: no row,
|
||||
// 403. The lookup cannot be talked out of its scope.
|
||||
const customer = await this.prisma.customer.findFirst({
|
||||
where: {
|
||||
id: actAs,
|
||||
referredByAgentId: admin.id,
|
||||
isActive: true,
|
||||
isArchived: false,
|
||||
},
|
||||
select: { id: true, mobile: true },
|
||||
});
|
||||
|
||||
if (!customer) {
|
||||
// Not 401: the expert's own session is perfectly valid, it is this
|
||||
// particular impersonation that is refused — so the app can clear the
|
||||
// act-as state instead of logging them out.
|
||||
throw new ForbiddenException('دسترسی به این مشتری مجاز نیست');
|
||||
}
|
||||
|
||||
return {
|
||||
id: customer.id,
|
||||
mobile: customer.mobile,
|
||||
type: EXPERT_TOKEN_TYPE,
|
||||
adminUserId: admin.id,
|
||||
actingAsCustomerId: customer.id,
|
||||
};
|
||||
}
|
||||
|
||||
const trading = admin.salesExpertProfile?.tradingCustomer;
|
||||
if (!trading || !trading.isActive || trading.isArchived) {
|
||||
// The account is created at sign-in; if it is missing or has been
|
||||
|
||||
@@ -22,11 +22,23 @@ import type { AuthenticatedCustomer } from '../customer-auth/customer-jwt.strate
|
||||
export class OrdersController {
|
||||
constructor(private readonly orders: OrdersService) {}
|
||||
|
||||
/** The customer comes from the token; the body's `customerId` is ignored. */
|
||||
/**
|
||||
* The customer comes from the token; the body's `customerId` is ignored.
|
||||
*
|
||||
* `me.id` is already the right customer when a sales expert is acting as one
|
||||
* of theirs, so such an order lands on that customer's account and ledger with
|
||||
* server-side pricing (MON-08) exactly like one they placed themselves — which
|
||||
* is what the reference did by lending the expert the customer's token.
|
||||
* `actingAsExpertId` records who actually placed it, which the reference could
|
||||
* not do.
|
||||
*/
|
||||
@CustomerAuth()
|
||||
@Post()
|
||||
create(@Body() dto: CreateOrderDto, @CurrentCustomer() me: AuthenticatedCustomer) {
|
||||
return this.orders.createOrder(dto, me.id, { placedBy: 'customer' });
|
||||
return this.orders.createOrder(dto, me.id, {
|
||||
placedBy: 'customer',
|
||||
actingAsExpertId: me.actingAsCustomerId ? me.adminUserId : undefined,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -154,6 +154,39 @@ describe('OrdersService.createOrder — server-side making charge', () => {
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* «ورود به حساب مشتری»: the order is the customer's in every respect — their
|
||||
* account, their pricing — and the expert is recorded only in the log, which
|
||||
* is the audit trail the reference lost by lending out the customer's token.
|
||||
*/
|
||||
it('records which expert placed an order on a customer’s behalf', async () => {
|
||||
const log = jest.spyOn(Logger.prototype, 'log').mockImplementation(() => undefined);
|
||||
try {
|
||||
const honest = { items: [{ productVariantId: 'v1', quantity: 1, wagePercent: 10 }] } as never;
|
||||
const { service, created } = build();
|
||||
await service.createOrder(honest, 'c1', { placedBy: 'customer', actingAsExpertId: 'adm_9' });
|
||||
// Still the customer's order, priced by the server.
|
||||
expect(created[0].customerId).toBe('c1');
|
||||
expect(created[0].totalGoldWeightGrams.toString()).toBe('11');
|
||||
const lines = log.mock.calls.map((c) => String(c[0])).join('\n');
|
||||
expect(lines).toContain('sales expert adm_9 acting as them');
|
||||
} finally {
|
||||
log.mockRestore();
|
||||
}
|
||||
});
|
||||
|
||||
it('logs no expert for an ordinary customer order', async () => {
|
||||
const log = jest.spyOn(Logger.prototype, 'log').mockImplementation(() => undefined);
|
||||
try {
|
||||
const honest = { items: [{ productVariantId: 'v1', quantity: 1, wagePercent: 10 }] } as never;
|
||||
await build().service.createOrder(honest, 'c1', { placedBy: 'customer' });
|
||||
const lines = log.mock.calls.map((c) => String(c[0])).join('\n');
|
||||
expect(lines).not.toContain('acting as');
|
||||
} finally {
|
||||
log.mockRestore();
|
||||
}
|
||||
});
|
||||
|
||||
it('stays quiet when the app sent the right figures', async () => {
|
||||
const warn = jest.spyOn(Logger.prototype, 'warn').mockImplementation(() => undefined);
|
||||
try {
|
||||
|
||||
@@ -45,7 +45,16 @@ export class OrdersService {
|
||||
async createOrder(
|
||||
dto: CreateOrderDto,
|
||||
customerId: string,
|
||||
opts: { placedBy: 'customer' | 'operator' } = { placedBy: 'operator' },
|
||||
opts: {
|
||||
placedBy: 'customer' | 'operator';
|
||||
/**
|
||||
* Set when a sales expert placed this through «ورود به حساب مشتری». The
|
||||
* order is the customer's in every other respect; this only records who
|
||||
* actually pressed the button, which the reference lost entirely by
|
||||
* lending out the customer's own token.
|
||||
*/
|
||||
actingAsExpertId?: string;
|
||||
} = { placedBy: 'operator' },
|
||||
) {
|
||||
const customer = await this.prisma.customer.findUnique({ where: { id: customerId } });
|
||||
if (!customer) throw new NotFoundException(`Customer ${customerId} not found`);
|
||||
@@ -169,6 +178,15 @@ export class OrdersService {
|
||||
// Legacy sent these after the order was committed
|
||||
// (ApiMobileController.php:733-766), so a rolled-back order never texts
|
||||
// anyone. Fire-and-forget per D20.
|
||||
// The audit trail for «ورود به حساب مشتری». Deliberately logged after the
|
||||
// commit, so it only ever claims an order that exists.
|
||||
if (opts.actingAsExpertId) {
|
||||
this.logger.log(
|
||||
`Order ${placed.orderNumber} for customer ${customerId} was placed by ` +
|
||||
`sales expert ${opts.actingAsExpertId} acting as them.`,
|
||||
);
|
||||
}
|
||||
|
||||
this.notifyOrderPlaced(placed.orderNumber, customer, totalGoldWeightGrams, isSuspendedOverCreditLimit);
|
||||
|
||||
return placed;
|
||||
|
||||
@@ -57,10 +57,18 @@ export class SalesExpertAppController {
|
||||
* Whether the signed-in principal is a sales expert. The apps call this once
|
||||
* after login to decide whether to show the two expert entries; the answer
|
||||
* comes from the token, so a customer cannot make it say yes.
|
||||
*
|
||||
* `actingAsCustomerId` lets an app that was reloaded mid-impersonation render
|
||||
* its "viewing as …" bar from the server's view of the session rather than
|
||||
* trusting its own stored state.
|
||||
*/
|
||||
@CustomerAuth()
|
||||
@Get('whoami')
|
||||
whoami(@CurrentCustomer() me: AuthenticatedCustomer) {
|
||||
return { isSalesExpert: Boolean(me.adminUserId), type: me.type };
|
||||
return {
|
||||
isSalesExpert: Boolean(me.adminUserId),
|
||||
type: me.type,
|
||||
actingAsCustomerId: me.actingAsCustomerId ?? null,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
already commented out in legacy's own App.vue, so neither ran there either.
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div :class="{ 'is-actingAs': Boolean(session.actingAs) }">
|
||||
<ActingAsBar />
|
||||
<component :is="getLayout" class="relative">
|
||||
<router-view v-slot="{ Component, route }">
|
||||
<keep-alive>
|
||||
@@ -35,8 +36,11 @@ import FullPageLayout from './layout/FullPageLayout.vue'
|
||||
import AppUpdateGate from './components/AppUpdateGate.vue'
|
||||
import ToastHost from './components/ui/ToastHost.vue'
|
||||
import ProductMorph from './components/product/ProductMorph.vue'
|
||||
import ActingAsBar from './components/expert/ActingAsBar.vue'
|
||||
import { useSessionStore } from './stores/session'
|
||||
|
||||
const router = useRouter()
|
||||
const session = useSessionStore()
|
||||
// Registers the service worker (offline, install). Updates are not applied
|
||||
// here: AppUpdateGate shows what changed and applies them on the user's tap.
|
||||
useRegisterSW()
|
||||
@@ -54,6 +58,12 @@ body::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* The act-as strip is fixed, so push everything down by its height while it is
|
||||
up — otherwise it covers the top of each page, including sticky headers. */
|
||||
.is-actingAs {
|
||||
padding-top: 30px;
|
||||
}
|
||||
|
||||
#app {
|
||||
overflow: hidden;
|
||||
direction: rtl !important;
|
||||
|
||||
@@ -2,6 +2,8 @@ import type { CreateOrderDto } from '@gold-bank/shared-types';
|
||||
|
||||
const BASE = '/api';
|
||||
const TOKEN_KEY = 'gold-bank:token';
|
||||
/** Must match stores/session.ts — the act-as target, if any. */
|
||||
const ACTING_AS_KEY = 'gold-bank:actingAs';
|
||||
|
||||
/**
|
||||
* Called when the API rejects our token. Wired up in main.ts rather than
|
||||
@@ -30,8 +32,28 @@ function readToken(): string | null {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* «ورود به حساب مشتری» — the customer a sales expert is working inside.
|
||||
*
|
||||
* Read from storage rather than the store for the same reason as the token: this
|
||||
* module must not depend on Pinia. The server treats this as a request, not a
|
||||
* fact: it re-checks on every call that the customer is actually referred by
|
||||
* this expert, so a forged value is a 403 and reveals nothing.
|
||||
*/
|
||||
function readActingAsId(): string | null {
|
||||
try {
|
||||
const raw = sessionStorage.getItem(ACTING_AS_KEY);
|
||||
if (!raw) return null;
|
||||
const parsed = JSON.parse(raw) as { id?: unknown };
|
||||
return typeof parsed?.id === 'string' && parsed.id ? parsed.id : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async function request<T>(path: string, options?: RequestInit): Promise<T> {
|
||||
const token = readToken();
|
||||
const actingAs = readActingAsId();
|
||||
|
||||
const res = await fetch(`${BASE}${path}`, {
|
||||
...options,
|
||||
@@ -40,6 +62,11 @@ async function request<T>(path: string, options?: RequestInit): Promise<T> {
|
||||
// Customer JWT from POST /customer/auth/verify-otp. The API derives the
|
||||
// customer from this, never from an id in the URL.
|
||||
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
||||
// Sent on every request while impersonating, which is what makes the whole
|
||||
// app render from the customer's point of view — the reference achieved
|
||||
// the same by swapping the bearer token in its axios interceptor
|
||||
// (henza_pwa plugins/axios.ts:18 via getUserToken()).
|
||||
...(actingAs ? { 'X-Act-As-Customer': actingAs } : {}),
|
||||
...options?.headers,
|
||||
},
|
||||
});
|
||||
@@ -403,10 +430,17 @@ export const api = {
|
||||
body.append('purpose', purpose);
|
||||
|
||||
const token = readToken();
|
||||
// This route bypasses `request()`, so the act-as header has to be repeated
|
||||
// here — without it an expert uploading a customer's documents would file
|
||||
// them against their OWN account, silently and with no error.
|
||||
const actingAs = readActingAsId();
|
||||
const res = await fetch(`${BASE}/customer/me/documents`, {
|
||||
method: 'POST',
|
||||
// No Content-Type: the browser sets it with the boundary.
|
||||
headers: token ? { Authorization: `Bearer ${token}` } : {},
|
||||
headers: {
|
||||
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
||||
...(actingAs ? { 'X-Act-As-Customer': actingAs } : {}),
|
||||
},
|
||||
body,
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
<!--
|
||||
«در حال مشاهده بهعنوان …» — shown while a sales expert is working inside one
|
||||
of their customers' accounts. Same logic as user-app's copy; the colours are
|
||||
this app's own.
|
||||
|
||||
NOT in the reference, and added on purpose. There, impersonation was invisible
|
||||
once the token had been swapped (myDataStore.ts:163): the only way an expert
|
||||
could tell whose account they were in was to notice the data looked wrong.
|
||||
Placing an order on the wrong customer's account — their gold debt, their
|
||||
ledger — was a single tap away with nothing to catch it.
|
||||
|
||||
It is also the exit. The reference's only way out was the logout button, which
|
||||
dropped the expert's own session too (Dashboard.vue:781-789).
|
||||
-->
|
||||
<template>
|
||||
<div v-if="session.actingAs" class="aab" role="status">
|
||||
<span class="aab__dot" aria-hidden="true" />
|
||||
<span class="aab__text">
|
||||
در حال مشاهده بهعنوان <strong>{{ session.actingAs.name || 'مشتری' }}</strong>
|
||||
</span>
|
||||
<button type="button" class="aab__exit" :disabled="leaving" @click="leave">
|
||||
{{ leaving ? '…' : 'خروج' }}
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { useSessionStore } from '../../stores/session'
|
||||
import { useCartStore } from '../../stores/cartStore'
|
||||
import { toast } from '../../composables/useToast'
|
||||
|
||||
const session = useSessionStore()
|
||||
const cart = useCartStore()
|
||||
const router = useRouter()
|
||||
const leaving = ref(false)
|
||||
|
||||
/**
|
||||
* Back to the expert's own account. The cart is cleared in this direction too:
|
||||
* a basket built inside the customer's account must not follow the expert out
|
||||
* and land on their own order.
|
||||
*/
|
||||
async function leave() {
|
||||
leaving.value = true
|
||||
try {
|
||||
cart.clear()
|
||||
session.setActingAs(null)
|
||||
await router.push({ name: 'home' })
|
||||
toast.info('به حساب خودتان بازگشتید')
|
||||
} finally {
|
||||
leaving.value = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
.aab {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 2000;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 7px 16px;
|
||||
/* Deliberately not a brand colour: this is a warning strip, and it has to be
|
||||
noticeable at a glance to do its job. */
|
||||
background: #8d6a46;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.18);
|
||||
}
|
||||
|
||||
.aab__dot {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
border-radius: 50%;
|
||||
background: #ffd9a0;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.aab__text {
|
||||
flex: 1 1 auto;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
|
||||
strong {
|
||||
font-weight: 800;
|
||||
}
|
||||
}
|
||||
|
||||
.aab__exit {
|
||||
flex: 0 0 auto;
|
||||
border: 1px solid rgba(255, 255, 255, 0.55);
|
||||
background: transparent;
|
||||
color: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 3px 12px;
|
||||
font-family: inherit;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
cursor: pointer;
|
||||
|
||||
&:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -21,10 +21,15 @@ export const useFavoritesStore = defineStore('favorites', () => {
|
||||
}
|
||||
}
|
||||
|
||||
// Loaded for whoever is signed in, cleared on logout — never another user's list.
|
||||
// Loaded for whoever is signed in, cleared on logout — never another user's
|
||||
// list. `actingAs` is watched alongside the token because «ورود به حساب
|
||||
// مشتری» changes whose favourites these are WITHOUT changing the token: a
|
||||
// sales expert entering a customer's account would otherwise see their own
|
||||
// hearts on the customer's products, and tapping one would write to the
|
||||
// customer's list.
|
||||
watch(
|
||||
() => session.token,
|
||||
(token) => {
|
||||
() => [session.token, session.actingAs?.id ?? null] as const,
|
||||
([token]) => {
|
||||
ids.value = []
|
||||
if (token) void load()
|
||||
},
|
||||
|
||||
@@ -16,7 +16,8 @@
|
||||
// making it deeply reactive would cost more than the request it saves.
|
||||
//
|
||||
// Keys under `me:` hold one customer's data. They are dropped whenever the
|
||||
// session token changes, so the next user never sees the previous one's data.
|
||||
// session token changes — or the act-as target does, which changes whose data
|
||||
// they hold without changing the token — so one user never sees another's.
|
||||
import { defineStore } from 'pinia'
|
||||
import { watch } from 'vue'
|
||||
import { useSessionStore } from './session'
|
||||
@@ -91,8 +92,13 @@ export const useQueryCache = defineStore('queryCache', () => {
|
||||
}
|
||||
}
|
||||
|
||||
// The token changes when the user changes — and, with «ورود به حساب مشتری»,
|
||||
// WHOSE data `me:` keys hold changes without the token changing at all. Both
|
||||
// have to drop the cache, or a sales expert entering a customer's account
|
||||
// would be shown their own profile, orders, balance and ledger from before
|
||||
// the switch.
|
||||
watch(
|
||||
() => session.token,
|
||||
() => [session.token, session.actingAs?.id ?? null],
|
||||
() => clearUserScoped(),
|
||||
)
|
||||
|
||||
|
||||
@@ -7,6 +7,33 @@ const MOBILE_KEY = 'gold-bank:mobile';
|
||||
const LEGACY_FLAG_KEY = 'appToken';
|
||||
/** D21 — cached so the expert menu entries render before whoami resolves. */
|
||||
const EXPERT_KEY = 'gold-bank:isSalesExpert';
|
||||
/**
|
||||
* «ورود به حساب مشتری» — which of the expert's customers they are working
|
||||
* inside, if any.
|
||||
*
|
||||
* Deliberately `sessionStorage`, not `localStorage`: closing the tab ends the
|
||||
* impersonation. The reference kept the customer's own permanent api_token in
|
||||
* localStorage (myDataStore.ts:163), so it survived restarts indefinitely and
|
||||
* outlived the expert's employment. Here it is only a hint anyway — the server
|
||||
* re-checks on every request that this customer is actually theirs.
|
||||
*/
|
||||
const ACTING_AS_KEY = 'gold-bank:actingAs';
|
||||
|
||||
export interface ActingAs {
|
||||
id: string;
|
||||
name: string;
|
||||
}
|
||||
|
||||
function readActingAs(): ActingAs | null {
|
||||
try {
|
||||
const raw = sessionStorage.getItem(ACTING_AS_KEY);
|
||||
if (!raw) return null;
|
||||
const parsed = JSON.parse(raw) as ActingAs;
|
||||
return parsed && typeof parsed.id === 'string' ? parsed : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The logged-in customer's session.
|
||||
@@ -36,6 +63,14 @@ export const useSessionStore = defineStore('session', {
|
||||
* an ordinary customer, so flipping this in devtools reveals nothing.
|
||||
*/
|
||||
isSalesExpert: localStorage.getItem(EXPERT_KEY) === '1',
|
||||
/**
|
||||
* The customer this expert is currently working as, or null.
|
||||
*
|
||||
* Display and request-header state only — never an authorisation claim.
|
||||
* Putting another customer's id here gets a 403 from the server, which
|
||||
* scopes the lookup to `referredByAgentId` on every single request.
|
||||
*/
|
||||
actingAs: readActingAs() as ActingAs | null,
|
||||
}),
|
||||
getters: {
|
||||
/** Authenticated means holding a token, not merely knowing an id. */
|
||||
@@ -58,6 +93,23 @@ export const useSessionStore = defineStore('session', {
|
||||
if (value) localStorage.setItem(EXPERT_KEY, '1');
|
||||
else localStorage.removeItem(EXPERT_KEY);
|
||||
},
|
||||
|
||||
/**
|
||||
* Enter or leave a customer's account. `null` returns the expert to their
|
||||
* own. The reference did the same through `toggleActiveUser`
|
||||
* (myDataStore.ts:159-169), which swapped the token; nothing is swapped
|
||||
* here — the API client just starts naming this customer in a header.
|
||||
*/
|
||||
setActingAs(value: ActingAs | null) {
|
||||
this.actingAs = value;
|
||||
try {
|
||||
if (value) sessionStorage.setItem(ACTING_AS_KEY, JSON.stringify(value));
|
||||
else sessionStorage.removeItem(ACTING_AS_KEY);
|
||||
} catch {
|
||||
// A private window with storage blocked: the in-memory value still
|
||||
// drives this tab, which is all the feature needs.
|
||||
}
|
||||
},
|
||||
/**
|
||||
* Clears everything. Called on explicit logout and by the API client when a
|
||||
* request comes back 401 — an expired or revoked token must not leave stale
|
||||
@@ -68,6 +120,12 @@ export const useSessionStore = defineStore('session', {
|
||||
this.customerId = null;
|
||||
this.mobile = null;
|
||||
this.isSalesExpert = false;
|
||||
this.actingAs = null;
|
||||
try {
|
||||
sessionStorage.removeItem(ACTING_AS_KEY);
|
||||
} catch {
|
||||
/* storage blocked; the in-memory reset above is what matters */
|
||||
}
|
||||
localStorage.removeItem(EXPERT_KEY);
|
||||
localStorage.removeItem(TOKEN_KEY);
|
||||
localStorage.removeItem(CUSTOMER_ID_KEY);
|
||||
|
||||
@@ -22,8 +22,12 @@ export const useWageQuoteStore = defineStore('wageQuotes', () => {
|
||||
let timer: ReturnType<typeof setTimeout> | null = null
|
||||
|
||||
// A different customer has a different percent: never reuse another's quotes.
|
||||
// That includes «ورود به حساب مشتری», which swaps WHICH customer we are
|
||||
// quoting for without swapping the token — so a sales expert would otherwise
|
||||
// see their own making charge on the customer's products, and the figure on
|
||||
// screen would not be the one the order is placed at.
|
||||
watch(
|
||||
() => session.token,
|
||||
() => [session.token, session.actingAs?.id ?? null],
|
||||
() => {
|
||||
quotes.value = {}
|
||||
pending.clear()
|
||||
|
||||
@@ -14,15 +14,18 @@
|
||||
scope is commented out at ApiMobileController.php:187, so every referred
|
||||
customer appears whatever their state (D4: replicate, don't "fix")
|
||||
|
||||
Deliberately NOT ported — two things, both recorded in D21:
|
||||
1. `changeUser` / act-as. The reference minted an api_token for each listed
|
||||
customer (ApiMobileController.php:197-201) so the agent could act AS them.
|
||||
That is a session-hijack primitive; every session here derives from the
|
||||
caller's own token, so tapping a card opens their details instead.
|
||||
2. The activate/deactivate toggle and the edit button, which posted to
|
||||
`/customer/toggle-active` and the customer form. Those are admin-panel
|
||||
operations here, and adding a write path to the app during a delivery is
|
||||
not worth the risk. The state is shown, read-only.
|
||||
`changeUser` / act-as IS ported — see `enterAccount` below and D29. It was
|
||||
previously left out as a session-hijack primitive (D21); the owner asked for
|
||||
it back, so the capability is the reference's but the mechanism is not. The
|
||||
reference minted a permanent api_token per customer
|
||||
(ApiMobileController.php:197-201) and swapped the bearer token; here the
|
||||
expert keeps their own token and the client names the customer in a header,
|
||||
which the server re-authorises on every request.
|
||||
|
||||
Still deliberately NOT ported (D21):
|
||||
- The activate/deactivate toggle and the edit button, which posted to
|
||||
`/customer/toggle-active` and the customer form. Those are admin-panel
|
||||
operations here. The state is shown, read-only.
|
||||
|
||||
Scope is the server's: `referredByAgentId` = this expert, from the token.
|
||||
-->
|
||||
@@ -127,6 +130,9 @@
|
||||
<dd>{{ active.active === 1 ? 'فعال' : 'غیرفعال' }}</dd>
|
||||
</div>
|
||||
</dl>
|
||||
<button type="button" class="cch__enter" :disabled="entering" @click="enterAccount(active)">
|
||||
{{ entering ? 'در حال ورود…' : 'ورود به حساب این مشتری' }}
|
||||
</button>
|
||||
<button type="button" class="cch__close" @click="detailOpen = false">بستن</button>
|
||||
</div>
|
||||
</Drawer>
|
||||
@@ -135,6 +141,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { onMounted, ref } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { Drawer } from 'ant-design-vue'
|
||||
import { Loading, PullRefresh } from 'vant'
|
||||
import Icon from '../../components/icon/Icon.vue'
|
||||
@@ -142,6 +149,14 @@ import PageBar from '../../components/ui/PageBar.vue'
|
||||
import Spinner from '../../components/Spinner.vue'
|
||||
import SearchInput from '../../components/search/SearchInput.vue'
|
||||
import { api, type ExpertCustomer } from '../../api/client'
|
||||
import { useSessionStore } from '../../stores/session'
|
||||
import { useCartStore } from '../../stores/cartStore'
|
||||
import { toast } from '../../composables/useToast'
|
||||
|
||||
const router = useRouter()
|
||||
const session = useSessionStore()
|
||||
const cart = useCartStore()
|
||||
const entering = ref(false)
|
||||
|
||||
const rows = ref<ExpertCustomer[]>([])
|
||||
const loading = ref(false)
|
||||
@@ -190,6 +205,30 @@ function openDetail(item: ExpertCustomer) {
|
||||
detailOpen.value = true
|
||||
}
|
||||
|
||||
/**
|
||||
* «ورود به حساب مشتری» — the reference's `changeUser`
|
||||
* (customerChoice.vue:155-167). There it swapped the bearer token for the
|
||||
* customer's own; here the session simply records who we are acting as and the
|
||||
* API client names them in a header, which the server authorises per request.
|
||||
*
|
||||
* The cart is cleared in both directions: it lives in localStorage, so without
|
||||
* this the expert's own basket would follow them into the customer's account
|
||||
* and end up on the customer's order.
|
||||
*/
|
||||
async function enterAccount(item: ExpertCustomer) {
|
||||
entering.value = true
|
||||
try {
|
||||
cart.clear()
|
||||
session.setActingAs({ id: item.id, name: item.name ?? item.fullName ?? item.mobile ?? '' })
|
||||
detailOpen.value = false
|
||||
// Same destination as the reference, which returned to the dashboard.
|
||||
await router.push({ name: 'userPage::hasSubRoute' })
|
||||
toast.success(`وارد حساب ${item.name ?? ''} شدید`)
|
||||
} finally {
|
||||
entering.value = false
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(load)
|
||||
</script>
|
||||
|
||||
@@ -347,7 +386,7 @@ onMounted(load)
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.cch__close {
|
||||
.cch__enter {
|
||||
margin-top: 18px;
|
||||
width: 100%;
|
||||
padding: 13px;
|
||||
@@ -359,5 +398,25 @@ onMounted(load)
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
cursor: pointer;
|
||||
|
||||
&:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
|
||||
/* Secondary now that "enter the account" is the primary action here. */
|
||||
.cch__close {
|
||||
margin-top: 10px;
|
||||
width: 100%;
|
||||
padding: 13px;
|
||||
border: 1px solid fade(@ink, 35%);
|
||||
border-radius: 14px;
|
||||
background: transparent;
|
||||
color: @ink;
|
||||
font-family: inherit;
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
already commented out in legacy's own App.vue, so neither ran there either.
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div :class="{ 'is-actingAs': Boolean(session.actingAs) }">
|
||||
<ActingAsBar />
|
||||
<component :is="getLayout" class="relative">
|
||||
<router-view v-slot="{ Component, route }">
|
||||
<keep-alive>
|
||||
@@ -35,8 +36,11 @@ import FullPageLayout from './layout/FullPageLayout.vue'
|
||||
import AppUpdateGate from './components/AppUpdateGate.vue'
|
||||
import ToastHost from './components/ui/ToastHost.vue'
|
||||
import ProductMorph from './components/product/ProductMorph.vue'
|
||||
import ActingAsBar from './components/expert/ActingAsBar.vue'
|
||||
import { useSessionStore } from './stores/session'
|
||||
|
||||
const router = useRouter()
|
||||
const session = useSessionStore()
|
||||
// Registers the service worker (offline, install). Updates are not applied
|
||||
// here: AppUpdateGate shows what changed and applies them on the user's tap.
|
||||
useRegisterSW()
|
||||
@@ -54,6 +58,12 @@ body::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* The act-as strip is fixed, so push everything down by its height while it is
|
||||
up — otherwise it covers the top of each page, including sticky headers. */
|
||||
.is-actingAs {
|
||||
padding-top: 30px;
|
||||
}
|
||||
|
||||
#app {
|
||||
overflow: hidden;
|
||||
direction: rtl !important;
|
||||
|
||||
@@ -2,6 +2,8 @@ import type { CreateOrderDto } from '@gold-bank/shared-types';
|
||||
|
||||
const BASE = '/api';
|
||||
const TOKEN_KEY = 'gold-bank:token';
|
||||
/** Must match stores/session.ts — the act-as target, if any. */
|
||||
const ACTING_AS_KEY = 'gold-bank:actingAs';
|
||||
|
||||
/**
|
||||
* Called when the API rejects our token. Wired up in main.ts rather than
|
||||
@@ -30,8 +32,28 @@ function readToken(): string | null {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* «ورود به حساب مشتری» — the customer a sales expert is working inside.
|
||||
*
|
||||
* Read from storage rather than the store for the same reason as the token: this
|
||||
* module must not depend on Pinia. The server treats this as a request, not a
|
||||
* fact: it re-checks on every call that the customer is actually referred by
|
||||
* this expert, so a forged value is a 403 and reveals nothing.
|
||||
*/
|
||||
function readActingAsId(): string | null {
|
||||
try {
|
||||
const raw = sessionStorage.getItem(ACTING_AS_KEY);
|
||||
if (!raw) return null;
|
||||
const parsed = JSON.parse(raw) as { id?: unknown };
|
||||
return typeof parsed?.id === 'string' && parsed.id ? parsed.id : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async function request<T>(path: string, options?: RequestInit): Promise<T> {
|
||||
const token = readToken();
|
||||
const actingAs = readActingAsId();
|
||||
|
||||
const res = await fetch(`${BASE}${path}`, {
|
||||
...options,
|
||||
@@ -40,6 +62,11 @@ async function request<T>(path: string, options?: RequestInit): Promise<T> {
|
||||
// Customer JWT from POST /customer/auth/verify-otp. The API derives the
|
||||
// customer from this, never from an id in the URL.
|
||||
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
||||
// Sent on every request while impersonating, which is what makes the whole
|
||||
// app render from the customer's point of view — the reference achieved
|
||||
// the same by swapping the bearer token in its axios interceptor
|
||||
// (henza_pwa plugins/axios.ts:18 via getUserToken()).
|
||||
...(actingAs ? { 'X-Act-As-Customer': actingAs } : {}),
|
||||
...options?.headers,
|
||||
},
|
||||
});
|
||||
@@ -420,10 +447,17 @@ export const api = {
|
||||
body.append('purpose', purpose);
|
||||
|
||||
const token = readToken();
|
||||
// This route bypasses `request()`, so the act-as header has to be repeated
|
||||
// here — without it an expert uploading a customer's documents would file
|
||||
// them against their OWN account, silently and with no error.
|
||||
const actingAs = readActingAsId();
|
||||
const res = await fetch(`${BASE}/customer/me/documents`, {
|
||||
method: 'POST',
|
||||
// No Content-Type: the browser sets it with the boundary.
|
||||
headers: token ? { Authorization: `Bearer ${token}` } : {},
|
||||
headers: {
|
||||
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
||||
...(actingAs ? { 'X-Act-As-Customer': actingAs } : {}),
|
||||
},
|
||||
body,
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
<!--
|
||||
«در حال مشاهده بهعنوان …» — shown while a sales expert is working inside one
|
||||
of their customers' accounts.
|
||||
|
||||
NOT in the reference, and added on purpose. There, impersonation was invisible
|
||||
once the token had been swapped (myDataStore.ts:163): the only way an expert
|
||||
could tell whose account they were in was to notice the data looked wrong.
|
||||
Placing an order on the wrong customer's account — their gold debt, their
|
||||
ledger — was a single tap away with nothing to catch it.
|
||||
|
||||
It is also the exit. The reference's only way out was the logout button, which
|
||||
dropped the expert's own session too (Dashboard.vue:781-789).
|
||||
-->
|
||||
<template>
|
||||
<div v-if="session.actingAs" class="aab" role="status">
|
||||
<span class="aab__dot" aria-hidden="true" />
|
||||
<span class="aab__text">
|
||||
در حال مشاهده بهعنوان <strong>{{ session.actingAs.name || 'مشتری' }}</strong>
|
||||
</span>
|
||||
<button type="button" class="aab__exit" :disabled="leaving" @click="leave">
|
||||
{{ leaving ? '…' : 'خروج' }}
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { useSessionStore } from '../../stores/session'
|
||||
import { useCartStore } from '../../stores/cartStore'
|
||||
import { toast } from '../../composables/useToast'
|
||||
|
||||
const session = useSessionStore()
|
||||
const cart = useCartStore()
|
||||
const router = useRouter()
|
||||
const leaving = ref(false)
|
||||
|
||||
/**
|
||||
* Back to the expert's own account. The cart is cleared in this direction too:
|
||||
* a basket built inside the customer's account must not follow the expert out
|
||||
* and land on their own order.
|
||||
*/
|
||||
async function leave() {
|
||||
leaving.value = true
|
||||
try {
|
||||
cart.clear()
|
||||
session.setActingAs(null)
|
||||
await router.push({ name: 'home' })
|
||||
toast.info('به حساب خودتان بازگشتید')
|
||||
} finally {
|
||||
leaving.value = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
.aab {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 2000;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 7px 16px;
|
||||
/* Deliberately not a brand colour: this is a warning strip, and it has to be
|
||||
noticeable at a glance to do its job. */
|
||||
background: #8d6a46;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.18);
|
||||
}
|
||||
|
||||
.aab__dot {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
border-radius: 50%;
|
||||
background: #ffd9a0;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.aab__text {
|
||||
flex: 1 1 auto;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
|
||||
strong {
|
||||
font-weight: 800;
|
||||
}
|
||||
}
|
||||
|
||||
.aab__exit {
|
||||
flex: 0 0 auto;
|
||||
border: 1px solid rgba(255, 255, 255, 0.55);
|
||||
background: transparent;
|
||||
color: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 3px 12px;
|
||||
font-family: inherit;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
cursor: pointer;
|
||||
|
||||
&:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -21,10 +21,15 @@ export const useFavoritesStore = defineStore('favorites', () => {
|
||||
}
|
||||
}
|
||||
|
||||
// Loaded for whoever is signed in, cleared on logout — never another user's list.
|
||||
// Loaded for whoever is signed in, cleared on logout — never another user's
|
||||
// list. `actingAs` is watched alongside the token because «ورود به حساب
|
||||
// مشتری» changes whose favourites these are WITHOUT changing the token: a
|
||||
// sales expert entering a customer's account would otherwise see their own
|
||||
// hearts on the customer's products, and tapping one would write to the
|
||||
// customer's list.
|
||||
watch(
|
||||
() => session.token,
|
||||
(token) => {
|
||||
() => [session.token, session.actingAs?.id ?? null] as const,
|
||||
([token]) => {
|
||||
ids.value = []
|
||||
if (token) void load()
|
||||
},
|
||||
|
||||
@@ -16,7 +16,8 @@
|
||||
// making it deeply reactive would cost more than the request it saves.
|
||||
//
|
||||
// Keys under `me:` hold one customer's data. They are dropped whenever the
|
||||
// session token changes, so the next user never sees the previous one's data.
|
||||
// session token changes — or the act-as target does, which changes whose data
|
||||
// they hold without changing the token — so one user never sees another's.
|
||||
import { defineStore } from 'pinia'
|
||||
import { watch } from 'vue'
|
||||
import { useSessionStore } from './session'
|
||||
@@ -91,8 +92,13 @@ export const useQueryCache = defineStore('queryCache', () => {
|
||||
}
|
||||
}
|
||||
|
||||
// The token changes when the user changes — and, with «ورود به حساب مشتری»,
|
||||
// WHOSE data `me:` keys hold changes without the token changing at all. Both
|
||||
// have to drop the cache, or a sales expert entering a customer's account
|
||||
// would be shown their own profile, orders, balance and ledger from before
|
||||
// the switch.
|
||||
watch(
|
||||
() => session.token,
|
||||
() => [session.token, session.actingAs?.id ?? null],
|
||||
() => clearUserScoped(),
|
||||
)
|
||||
|
||||
|
||||
@@ -7,6 +7,33 @@ const MOBILE_KEY = 'gold-bank:mobile';
|
||||
const LEGACY_FLAG_KEY = 'appToken';
|
||||
/** D21 — cached so the expert menu entries render before whoami resolves. */
|
||||
const EXPERT_KEY = 'gold-bank:isSalesExpert';
|
||||
/**
|
||||
* «ورود به حساب مشتری» — which of the expert's customers they are working
|
||||
* inside, if any.
|
||||
*
|
||||
* Deliberately `sessionStorage`, not `localStorage`: closing the tab ends the
|
||||
* impersonation. The reference kept the customer's own permanent api_token in
|
||||
* localStorage (myDataStore.ts:163), so it survived restarts indefinitely and
|
||||
* outlived the expert's employment. Here it is only a hint anyway — the server
|
||||
* re-checks on every request that this customer is actually theirs.
|
||||
*/
|
||||
const ACTING_AS_KEY = 'gold-bank:actingAs';
|
||||
|
||||
export interface ActingAs {
|
||||
id: string;
|
||||
name: string;
|
||||
}
|
||||
|
||||
function readActingAs(): ActingAs | null {
|
||||
try {
|
||||
const raw = sessionStorage.getItem(ACTING_AS_KEY);
|
||||
if (!raw) return null;
|
||||
const parsed = JSON.parse(raw) as ActingAs;
|
||||
return parsed && typeof parsed.id === 'string' ? parsed : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The logged-in customer's session.
|
||||
@@ -36,6 +63,14 @@ export const useSessionStore = defineStore('session', {
|
||||
* an ordinary customer, so flipping this in devtools reveals nothing.
|
||||
*/
|
||||
isSalesExpert: localStorage.getItem(EXPERT_KEY) === '1',
|
||||
/**
|
||||
* The customer this expert is currently working as, or null.
|
||||
*
|
||||
* Display and request-header state only — never an authorisation claim.
|
||||
* Putting another customer's id here gets a 403 from the server, which
|
||||
* scopes the lookup to `referredByAgentId` on every single request.
|
||||
*/
|
||||
actingAs: readActingAs() as ActingAs | null,
|
||||
}),
|
||||
getters: {
|
||||
/** Authenticated means holding a token, not merely knowing an id. */
|
||||
@@ -58,6 +93,23 @@ export const useSessionStore = defineStore('session', {
|
||||
if (value) localStorage.setItem(EXPERT_KEY, '1');
|
||||
else localStorage.removeItem(EXPERT_KEY);
|
||||
},
|
||||
|
||||
/**
|
||||
* Enter or leave a customer's account. `null` returns the expert to their
|
||||
* own. The reference did the same through `toggleActiveUser`
|
||||
* (myDataStore.ts:159-169), which swapped the token; nothing is swapped
|
||||
* here — the API client just starts naming this customer in a header.
|
||||
*/
|
||||
setActingAs(value: ActingAs | null) {
|
||||
this.actingAs = value;
|
||||
try {
|
||||
if (value) sessionStorage.setItem(ACTING_AS_KEY, JSON.stringify(value));
|
||||
else sessionStorage.removeItem(ACTING_AS_KEY);
|
||||
} catch {
|
||||
// A private window with storage blocked: the in-memory value still
|
||||
// drives this tab, which is all the feature needs.
|
||||
}
|
||||
},
|
||||
/**
|
||||
* Clears everything. Called on explicit logout and by the API client when a
|
||||
* request comes back 401 — an expired or revoked token must not leave stale
|
||||
@@ -68,6 +120,12 @@ export const useSessionStore = defineStore('session', {
|
||||
this.customerId = null;
|
||||
this.mobile = null;
|
||||
this.isSalesExpert = false;
|
||||
this.actingAs = null;
|
||||
try {
|
||||
sessionStorage.removeItem(ACTING_AS_KEY);
|
||||
} catch {
|
||||
/* storage blocked; the in-memory reset above is what matters */
|
||||
}
|
||||
localStorage.removeItem(EXPERT_KEY);
|
||||
localStorage.removeItem(TOKEN_KEY);
|
||||
localStorage.removeItem(CUSTOMER_ID_KEY);
|
||||
|
||||
@@ -22,8 +22,12 @@ export const useWageQuoteStore = defineStore('wageQuotes', () => {
|
||||
let timer: ReturnType<typeof setTimeout> | null = null
|
||||
|
||||
// A different customer has a different percent: never reuse another's quotes.
|
||||
// That includes «ورود به حساب مشتری», which swaps WHICH customer we are
|
||||
// quoting for without swapping the token — so a sales expert would otherwise
|
||||
// see their own making charge on the customer's products, and the figure on
|
||||
// screen would not be the one the order is placed at.
|
||||
watch(
|
||||
() => session.token,
|
||||
() => [session.token, session.actingAs?.id ?? null],
|
||||
() => {
|
||||
quotes.value = {}
|
||||
pending.clear()
|
||||
|
||||
@@ -14,15 +14,18 @@
|
||||
scope is commented out at ApiMobileController.php:187, so every referred
|
||||
customer appears whatever their state (D4: replicate, don't "fix")
|
||||
|
||||
Deliberately NOT ported — two things, both recorded in D21:
|
||||
1. `changeUser` / act-as. The reference minted an api_token for each listed
|
||||
customer (ApiMobileController.php:197-201) so the agent could act AS them.
|
||||
That is a session-hijack primitive; every session here derives from the
|
||||
caller's own token, so tapping a card opens their details instead.
|
||||
2. The activate/deactivate toggle and the edit button, which posted to
|
||||
`/customer/toggle-active` and the customer form. Those are admin-panel
|
||||
operations here, and adding a write path to the app during a delivery is
|
||||
not worth the risk. The state is shown, read-only.
|
||||
`changeUser` / act-as IS ported — see `enterAccount` below and D29. It was
|
||||
previously left out as a session-hijack primitive (D21); the owner asked for
|
||||
it back, so the capability is the reference's but the mechanism is not. The
|
||||
reference minted a permanent api_token per customer
|
||||
(ApiMobileController.php:197-201) and swapped the bearer token; here the
|
||||
expert keeps their own token and the client names the customer in a header,
|
||||
which the server re-authorises on every request.
|
||||
|
||||
Still deliberately NOT ported (D21):
|
||||
- The activate/deactivate toggle and the edit button, which posted to
|
||||
`/customer/toggle-active` and the customer form. Those are admin-panel
|
||||
operations here. The state is shown, read-only.
|
||||
|
||||
Scope is the server's: `referredByAgentId` = this expert, from the token.
|
||||
-->
|
||||
@@ -127,6 +130,9 @@
|
||||
<dd>{{ active.active === 1 ? 'فعال' : 'غیرفعال' }}</dd>
|
||||
</div>
|
||||
</dl>
|
||||
<button type="button" class="cch__enter" :disabled="entering" @click="enterAccount(active)">
|
||||
{{ entering ? 'در حال ورود…' : 'ورود به حساب این مشتری' }}
|
||||
</button>
|
||||
<button type="button" class="cch__close" @click="detailOpen = false">بستن</button>
|
||||
</div>
|
||||
</Drawer>
|
||||
@@ -135,6 +141,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { onMounted, ref } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { Drawer } from 'ant-design-vue'
|
||||
import { Loading, PullRefresh } from 'vant'
|
||||
import Icon from '../../components/icon/Icon.vue'
|
||||
@@ -142,6 +149,14 @@ import PageBar from '../../components/ui/PageBar.vue'
|
||||
import Spinner from '../../components/Spinner.vue'
|
||||
import SearchInput from '../../components/search/SearchInput.vue'
|
||||
import { api, type ExpertCustomer } from '../../api/client'
|
||||
import { useSessionStore } from '../../stores/session'
|
||||
import { useCartStore } from '../../stores/cartStore'
|
||||
import { toast } from '../../composables/useToast'
|
||||
|
||||
const router = useRouter()
|
||||
const session = useSessionStore()
|
||||
const cart = useCartStore()
|
||||
const entering = ref(false)
|
||||
|
||||
const rows = ref<ExpertCustomer[]>([])
|
||||
const loading = ref(false)
|
||||
@@ -190,6 +205,30 @@ function openDetail(item: ExpertCustomer) {
|
||||
detailOpen.value = true
|
||||
}
|
||||
|
||||
/**
|
||||
* «ورود به حساب مشتری» — the reference's `changeUser`
|
||||
* (customerChoice.vue:155-167). There it swapped the bearer token for the
|
||||
* customer's own; here the session simply records who we are acting as and the
|
||||
* API client names them in a header, which the server authorises per request.
|
||||
*
|
||||
* The cart is cleared in both directions: it lives in localStorage, so without
|
||||
* this the expert's own basket would follow them into the customer's account
|
||||
* and end up on the customer's order.
|
||||
*/
|
||||
async function enterAccount(item: ExpertCustomer) {
|
||||
entering.value = true
|
||||
try {
|
||||
cart.clear()
|
||||
session.setActingAs({ id: item.id, name: item.name ?? item.fullName ?? item.mobile ?? '' })
|
||||
detailOpen.value = false
|
||||
// Same destination as the reference, which returned to the dashboard.
|
||||
await router.push({ name: 'userPage::hasSubRoute' })
|
||||
toast.success(`وارد حساب ${item.name ?? ''} شدید`)
|
||||
} finally {
|
||||
entering.value = false
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(load)
|
||||
</script>
|
||||
|
||||
@@ -334,7 +373,7 @@ onMounted(load)
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.cch__close {
|
||||
.cch__enter {
|
||||
margin-top: 18px;
|
||||
width: 100%;
|
||||
padding: 13px;
|
||||
@@ -346,5 +385,25 @@ onMounted(load)
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
cursor: pointer;
|
||||
|
||||
&:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
|
||||
/* Secondary now that "enter the account" is the primary action here. */
|
||||
.cch__close {
|
||||
margin-top: 10px;
|
||||
width: 100%;
|
||||
padding: 13px;
|
||||
border: 1px solid fade(@primary, 35%);
|
||||
border-radius: 14px;
|
||||
background: transparent;
|
||||
color: @primary;
|
||||
font-family: inherit;
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user