Skip to content
This repository was archived by the owner on Mar 10, 2026. It is now read-only.
Merged
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
6 changes: 6 additions & 0 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0

- name: Compute short SHA
id: vars
run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

- name: Build and push Docker image
id: push
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
Expand All @@ -67,6 +71,8 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
build-args: |
VITE_BUILD_HASH=${{ steps.vars.outputs.short_sha }}

- name: Generate artifact attestation
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
Expand Down
18 changes: 16 additions & 2 deletions src/app/pages/auth/register/registerUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ import {
} from '$types/matrix-sdk';
import { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { useSetAtom } from 'jotai';
import { LoginPathSearchParams } from '$pages/paths';
import {
deleteAfterLoginRedirectPath,
getAfterLoginRedirectPath,
} from '$pages/afterLoginRedirectPath';
import { getHomePath, getLoginPath, withSearchParam } from '$pages/pathUtils';
import { getMxIdLocalPart, getMxIdServer } from '$utils/matrix';
import { setFallbackSession } from '$state/sessions';
import { activeSessionIdAtom, sessionsAtom, setFallbackSession } from '$state/sessions';
import { ErrorCode } from '../../../cs-errorcode';

export enum RegisterError {
Expand Down Expand Up @@ -109,6 +110,8 @@ export const register = async (

export const useRegisterComplete = (data?: CustomRegisterResponse) => {
const navigate = useNavigate();
const setSessions = useSetAtom(sessionsAtom);
const setActiveSessionId = useSetAtom(activeSessionIdAtom);

useEffect(() => {
if (data) {
Expand All @@ -119,6 +122,17 @@ export const useRegisterComplete = (data?: CustomRegisterResponse) => {
const deviceId = response.device_id;

if (accessToken && deviceId) {
setSessions({
type: 'PUT',
session: {
baseUrl,
userId,
deviceId,
accessToken,
},
});
setActiveSessionId(userId);
// Keep legacy keys for SW/backward-compat paths still reading cinny_* values.
setFallbackSession(accessToken, deviceId, userId, baseUrl);
const afterLoginRedirectPath = getAfterLoginRedirectPath();
deleteAfterLoginRedirectPath();
Expand All @@ -134,5 +148,5 @@ export const useRegisterComplete = (data?: CustomRegisterResponse) => {
);
}
}
}, [data, navigate]);
}, [data, navigate, setSessions, setActiveSessionId]);
};
Loading