Skip to content

Commit aa4ca61

Browse files
committed
Merge fix/m3-auth: OAuth storage fix, token priority, lang guard
2 parents aac427a + 8ba4369 commit aa4ca61

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

src/background/service-worker.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ async function handleSolved(data) {
8888
if (data.files && Array.isArray(data.files)) {
8989
filesToCommit = [...data.files];
9090
} else {
91-
const filePath = `topics/${data.topic || "Uncategorized"}/${data.titleSlug}/${data.lang.name}.${data.lang.ext || "js"}`;
91+
const langName = data.lang?.name || "Solution";
92+
const langExt = data.lang?.ext || "txt";
93+
const filePath = `topics/${data.topic || "Uncategorized"}/${data.titleSlug}/${langName}.${langExt}`;
9294
filesToCommit.push({ path: filePath, content: data.code });
9395
}
9496

src/handlers/git/github/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,9 @@ export class GitHubHandler extends BaseGitHandler {
202202
}
203203

204204
async getToken() {
205+
const oauthToken = await Storage.getAuthToken("github");
206+
if (oauthToken) return oauthToken;
205207
const settings = await Storage.getSettings();
206-
return settings["github_token"] || (await Storage.getAuthToken("github"));
208+
return settings["github_token"] || null;
207209
}
208210
}

src/ui/components/SettingsSchema.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,10 @@ export function SettingsSchema({ schema, values, onChange }) {
261261
try {
262262
const data = ev && ev.data;
263263
if (!data) return;
264+
if (data.type !== "CODELEDGER_AUTH") return;
264265
if (data.provider !== provider) return;
265266
if (!data.token) return;
266-
const existing = await Storage.getAIKeys();
267-
existing[provider] = [data.token];
268-
await Storage.setAIKeys(existing);
267+
await Storage.setAuthToken(provider, data.token);
269268
onChange(key, data.token);
270269
setTestResults((s) => ({ ...s, [key]: "OK" }));
271270
} catch (e) {

0 commit comments

Comments
 (0)