Skip to content

Commit cc87e82

Browse files
committed
Do not send refresh token. All access tokens will be capped at 1h
1 parent 63e1d16 commit cc87e82

3 files changed

Lines changed: 8 additions & 20 deletions

File tree

apps/obsidian/src/components/AdminPanelSettings.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export const AdminPanelSettings = () => {
1515
plugin.settings.username || "",
1616
);
1717
const [accessToken, setAccessToken] = useState<string | null>(null);
18-
const [refreshToken, setRefreshToken] = useState<string | null>(null);
1918
useEffect(() => {
2019
if (syncModeEnabled) {
2120
const fetchTokens = async () => {
@@ -24,14 +23,12 @@ export const AdminPanelSettings = () => {
2423
const session = await client.auth.getSession();
2524
if (session.data.session) {
2625
setAccessToken(session.data.session.access_token);
27-
setRefreshToken(session.data.session.refresh_token);
2826
}
2927
}
3028
};
3129
void fetchTokens();
3230
} else {
3331
setAccessToken(null);
34-
setRefreshToken(null);
3532
}
3633
}, [syncModeEnabled, plugin]);
3734

@@ -102,23 +99,19 @@ export const AdminPanelSettings = () => {
10299
/>
103100
</div>
104101
</div>
105-
<div
106-
className={
107-
"setting-item " + (accessToken && refreshToken ? "" : "hidden")
108-
}
109-
>
102+
<div className={"setting-item " + (accessToken ? "" : "hidden")}>
110103
<div className="setting-item-info">
111104
<div className="setting-item-name">Group management</div>
112105
<div className="setting-item-description">
113106
This will allow you to view and manage your sharing groups
114107
</div>
115108
</div>
116109
<div className="setting-item-control">
117-
{accessToken && refreshToken && (
110+
{accessToken && (
118111
<button
119112
onClick={() => {
120113
window.open(
121-
`${nextRoot()}/auth/token?t=${accessToken}&r=${refreshToken}&url=/`,
114+
`${nextRoot()}/auth/token?t=${accessToken}&url=/`,
122115
"_blank",
123116
);
124117
}}

apps/roam/src/components/settings/AdminPanel.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,6 @@ const FeatureFlagsTab = (): React.ReactElement => {
268268
getFeatureFlag("Suggestive mode overlay enabled"),
269269
);
270270
const [accessToken, setAccessToken] = useState<string | null>(null);
271-
const [refreshToken, setRefreshToken] = useState<string | null>(null);
272-
//const syncAlreadyEnabled = duplicateNodeAlertValue || suggestiveOverlayValue;
273271
useEffect(() => {
274272
if (duplicateNodeAlertValue || suggestiveOverlayValue) {
275273
const fetchTokens = async () => {
@@ -278,14 +276,12 @@ const FeatureFlagsTab = (): React.ReactElement => {
278276
const session = await client.auth.getSession();
279277
if (session.data.session) {
280278
setAccessToken(session.data.session.access_token);
281-
setRefreshToken(session.data.session.refresh_token);
282279
}
283280
}
284281
};
285282
void fetchTokens();
286283
} else {
287284
setAccessToken(null);
288-
setRefreshToken(null);
289285
}
290286
}, [duplicateNodeAlertValue, suggestiveOverlayValue]);
291287

@@ -413,13 +409,13 @@ const FeatureFlagsTab = (): React.ReactElement => {
413409
>
414410
Send Error Email
415411
</Button>
416-
{accessToken && refreshToken && (
412+
{accessToken && (
417413
<Button
418414
className="w-96"
419415
icon="document-open"
420416
onClick={() => {
421417
window.open(
422-
`${nextRoot()}/auth/token?t=${accessToken}&r=${refreshToken}&url=/`,
418+
`${nextRoot()}/auth/token?t=${accessToken}&url=/`,
423419
"_blank",
424420
);
425421
}}

apps/website/app/components/auth/LoginWithToken.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ export const LoginWithToken = () => {
1212
const [url] = useState(searchParams.get("url"));
1313
const [done, setDone] = useState(false);
1414
const [error, setError] = useState<string | null>(
15-
accessToken === null || refreshToken == null
16-
? "Please provide tokens"
17-
: null,
15+
accessToken === null ? "Please provide access token" : null,
1816
);
1917

2018
const login = useCallback(async () => {
@@ -23,7 +21,8 @@ export const LoginWithToken = () => {
2321
const response = await client.auth.setSession({
2422
/* eslint-disable @typescript-eslint/naming-convention */
2523
access_token: accessToken!,
26-
refresh_token: refreshToken!,
24+
// in most cases, do not provide the refresh token! The access token will expire after 1h
25+
refresh_token: refreshToken ?? "faketoken",
2726
/* eslint-enable @typescript-eslint/naming-convention */
2827
});
2928
if (response.error) {

0 commit comments

Comments
 (0)