Skip to content
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: minor
---

# Device names are now dynamic, showing your browser and OS (e.g., "Sable on Firefox for Windows") instead of just "Sable Web".
7 changes: 4 additions & 3 deletions src/app/pages/auth/login/PasswordLoginForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { PasswordInput } from '$components/password-input';
import { getResetPasswordPath } from '$pages/pathUtils';
import { stopPropagation } from '$utils/keyboard';
import { FieldError } from '$pages/auth/FiledError';
import { deviceDisplayName } from '$utils/user-agent';
import {
CustomLoginResponse,
LoginError,
Expand Down Expand Up @@ -133,7 +134,7 @@ export function PasswordLoginForm({ defaultUsername, defaultEmail }: PasswordLog
user: username,
},
password,
initial_device_display_name: 'Sable Web',
initial_device_display_name: deviceDisplayName(),
});
};

Expand All @@ -151,7 +152,7 @@ export function PasswordLoginForm({ defaultUsername, defaultEmail }: PasswordLog
user: mxIdUsername,
},
password,
initial_device_display_name: 'Sable Web',
initial_device_display_name: deviceDisplayName(),
});
};
const handleEmailLogin = (email: string, password: string) => {
Expand All @@ -163,7 +164,7 @@ export function PasswordLoginForm({ defaultUsername, defaultEmail }: PasswordLog
address: email,
},
password,
initial_device_display_name: 'Sable Web',
initial_device_display_name: deviceDisplayName(),
});
};

Expand Down
3 changes: 2 additions & 1 deletion src/app/pages/auth/login/TokenLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { useCallback, useEffect } from 'react';
import { MatrixError } from '$types/matrix-sdk';
import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { deviceDisplayName } from '$utils/user-agent';
import { CustomLoginResponse, LoginError, login, useLoginComplete } from './loginUtil';

function LoginTokenError({ message }: { message: string }) {
Expand Down Expand Up @@ -57,7 +58,7 @@ export function TokenLogin({ token }: TokenLoginProps) {
startLogin(baseUrl, {
type: 'm.login.token',
token,
initial_device_display_name: 'Sable Web',
initial_device_display_name: deviceDisplayName(),
});
}, [baseUrl, token, startLogin]);

Expand Down
5 changes: 3 additions & 2 deletions src/app/pages/auth/register/PasswordRegisterForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import { ConfirmPasswordMatch } from '$components/ConfirmPasswordMatch';
import { UIAFlowOverlay } from '$components/UIAFlowOverlay';
import { RequestEmailTokenCallback, RequestEmailTokenResponse } from '$hooks/types';
import { FieldError } from '$pages/auth/FiledError';
import { deviceDisplayName } from '$utils/user-agent';
import { RegisterError, RegisterResult, register, useRegisterComplete } from './registerUtil';

export const SUPPORTED_REGISTER_STAGES = [
Expand Down Expand Up @@ -109,7 +110,7 @@ function RegisterUIAFlow({
auth: authDict,
password,
username,
initial_device_display_name: 'Sable Web',
initial_device_display_name: deviceDisplayName(),
});
},
[onRegister, formData]
Expand Down Expand Up @@ -250,7 +251,7 @@ export function PasswordRegisterForm({
auth: {
session: authData.session,
},
initial_device_display_name: 'Sable Web',
initial_device_display_name: deviceDisplayName(),
});
};

Expand Down
7 changes: 7 additions & 0 deletions src/app/utils/user-agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,10 @@ const isMac = result.os.name === 'Mac OS';
export const ua = () => result;
export const isMacOS = () => isMac;
export const mobileOrTablet = () => isMobileOrTablet;

export const deviceDisplayName = (): string => {
const browser = result.browser.name;
const os = result.os.name;
if (!browser || !os) return 'Sable Web';
return `Sable on ${browser} for ${os}`;
};
Loading