diff --git a/packages/cubejs-api-gateway/src/gateway.ts b/packages/cubejs-api-gateway/src/gateway.ts
index 8e2cfce793f26..87d69ff0e40fd 100644
--- a/packages/cubejs-api-gateway/src/gateway.ts
+++ b/packages/cubejs-api-gateway/src/gateway.ts
@@ -2158,6 +2158,11 @@ class ApiGateway {
 }
 
 public async contextByReq(req: Request, securityContext, requestId: string): Promise<extendedrequestcontext> {
+ req.securityContext = {
+ ...req.securityContext,
+ ...securityContext,
+ };
+ 
 const extensions = typeof this.extendContext === 'function' ? await this.extendContext(req) : {};
 
 return {
diff --git a/packages/cubejs-api-gateway/test/auth.test.ts b/packages/cubejs-api-gateway/test/auth.test.ts
index 5ee4f47903483..6ce1ab0127dda 100644
--- a/packages/cubejs-api-gateway/test/auth.test.ts
+++ b/packages/cubejs-api-gateway/test/auth.test.ts
@@ -673,4 +673,111 @@ describe('test authorization', () => {
 // no warnings, done on checkAuth/checkAuthMiddleware level
 expect(loggerMock.mock.calls.length).toEqual(0);
 });
+
+ test('extendContext receives securityContext from checkAuth', async () => {
+ const loggerMock = jest.fn(() => {
+ //
+ });
+
+ const extendContextMock = jest.fn((req) => ({
+ securityContext: {
+ ...req.securityContext,
+ extendedField: 'added_by_extend_context',
+ }
+ }));
+
+ const expectSecurityContext = (securityContext) => {
+ expect(securityContext.uid).toEqual(5);
+ expect(securityContext.extendedField).toEqual('added_by_extend_context');
+ expect(securityContext.iat).toBeDefined();
+ expect(securityContext.exp).toBeDefined();
+ };
+
+ const handlerMock = jest.fn((req, res) => {
+ expectSecurityContext(req.context.securityContext);
+ res.status(200).end();
+ });
+
+ const { app } = createApiGateway(handlerMock, loggerMock, {
+ extendContext: extendContextMock,
+ });
+
+ const token = generateAuthToken({ uid: 5 });
+
+ await request(app)
+ .get('/test-auth-fake')
+ .set('Authorization', `Authorization: ${token}`)
+ .expect(200);
+
+ expect(handlerMock.mock.calls.length).toEqual(1);
+ expect(extendContextMock.mock.calls.length).toEqual(1);
+
+ // should receive securityContext from checkAuth
+ expect(extendContextMock.mock.calls[0][0].securityContext).toMatchObject({
+ uid: 5,
+ iat: expect.any(Number),
+ exp: expect.any(Number),
+ });
+ expectSecurityContext(handlerMock.mock.calls[0][0].context.securityContext);
+ });
+
+ test('extendContext with custom checkAuth returning securityContext', async () => {
+ const loggerMock = jest.fn(() => {
+ //
+ });
+
+ const checkAuthMock = jest.fn(async (req: Request, auth?: string) => {
+ if (auth) {
+ const decoded = jwt.verify(auth, 'secret') as any;
+ return {
+ security_context: {
+ ...decoded,
+ tenantId: 'tenant_123',
+ customField: 'from_check_auth',
+ }
+ };
+ }
+ return {};
+ });
+
+ const extendContextMock = jest.fn((req) => {
+ // should receive securityContext from checkAuth
+ expect(req.securityContext).toBeDefined();
+ expect(req.securityContext.customField).toEqual('from_check_auth');
+ 
+ return {
+ securityContext: {
+ ...req.securityContext,
+ extendedField: 'from_extend_context',
+ }
+ };
+ });
+
+ const handlerMock = jest.fn((req, res) => {
+ expect(req.context.securityContext.customField).toEqual('from_check_auth');
+ expect(req.context.securityContext.extendedField).toEqual('from_extend_context');
+ res.status(200).end();
+ });
+
+ const { app } = createApiGateway(handlerMock, loggerMock, {
+ checkAuth: checkAuthMock,
+ extendContext: extendContextMock,
+ });
+
+ const token = generateAuthToken({ uid: 5 });
+
+ await request(app)
+ .get('/test-auth-fake')
+ .set('Authorization', `Authorization: ${token}`)
+ .expect(200);
+
+ expect(checkAuthMock.mock.calls.length).toEqual(1);
+ expect(extendContextMock.mock.calls.length).toEqual(1);
+ expect(handlerMock.mock.calls.length).toEqual(1);
+ expect(extendContextMock.mock.calls[0][0].securityContext).toMatchObject({
+ uid: 5,
+ tenantId: 'tenant_123',
+ customField: 'from_check_auth',
+ });
+ });
 });
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://patch-diff.githubusercontent.com/raw/cube-js/cube/pull/10050.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://patch-diff.githubusercontent.com/raw/cube-js/cube/pull/10050.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>