Date: Sat, 29 Aug 2026 16:00:31 +0200
Subject: [PATCH 4/8] Formatting
---
assets/scripts/GitAgent.ts | 4 +-
assets/scripts/config.ts | 14 +-
assets/scripts/oauth-services-api/github.ts | 4 +-
assets/scripts/oauth-services-api/gitlab.ts | 4 +-
assets/scripts/oauth-services-api/index.ts | 1 -
.../scripts/oauth-services-api/scribouilli.ts | 281 ++++++++++--------
assets/scripts/routes/account.ts | 2 +-
assets/scripts/routes/login.ts | 11 +-
assets/scripts/scribouilliGitRepo.ts | 11 +-
assets/scripts/types/atelier.ts | 25 +-
assets/scripts/types/git.ts | 4 +-
assets/styles/styles.css | 2 +-
12 files changed, 195 insertions(+), 168 deletions(-)
diff --git a/assets/scripts/GitAgent.ts b/assets/scripts/GitAgent.ts
index 652a8204..48098e59 100644
--- a/assets/scripts/GitAgent.ts
+++ b/assets/scripts/GitAgent.ts
@@ -39,8 +39,8 @@ export default class GitAgent {
}: {
repoId: string
remoteURL: string
- corsProxyURL?: string,
- gitServiceProvider: OAuthServiceAPI,
+ corsProxyURL?: string
+ gitServiceProvider: OAuthServiceAPI
onMergeConflict?:
| ((resolutionOptions: ResolutionOption[]) => void)
| undefined
diff --git a/assets/scripts/config.ts b/assets/scripts/config.ts
index 54d3854a..86cfa94b 100644
--- a/assets/scripts/config.ts
+++ b/assets/scripts/config.ts
@@ -40,7 +40,8 @@ export const PROVIDERS: ScribouilliBackendProvider[] = [
id: 'gitlab.com',
type: 'gitlab',
origin: 'https://gitlab.com',
- clientId: 'b943c32d1a30f316cf4a72b5e40b05b6e71a1e3df34e2233c51e79838b22f7e8',
+ clientId:
+ 'b943c32d1a30f316cf4a72b5e40b05b6e71a1e3df34e2233c51e79838b22f7e8',
name: 'Gitlab',
description: `
Gitlab.com qui est un hébergeur professionnel.
@@ -54,7 +55,8 @@ export const PROVIDERS: ScribouilliBackendProvider[] = [
id: 'git.scribouilli.org',
type: 'gitlab',
origin: 'https://git.scribouilli.org',
- clientId: '3e8ac6636615d396a8f73e02fa3880e7e2140981b0ca27b0f240a450f69f1c76',
+ clientId:
+ '3e8ac6636615d396a8f73e02fa3880e7e2140981b0ca27b0f240a450f69f1c76',
name: 'ScribouGit',
description: `
ScribouGit, l'hébergement géré par l'équipe de Scribouilli.
@@ -87,7 +89,7 @@ export const PROVIDERS: ScribouilliBackendProvider[] = [
name: 'GitHub',
signupEnabled: true,
signupLink: 'https://github.com/signup',
- signupInstructions:`
+ signupInstructions: `
Pour pouvoir publier votre contenu, il faut que Scribouilli se connecte
à un compte GitHub.
@@ -109,8 +111,10 @@ export const PROVIDERS: ScribouilliBackendProvider[] = [
`,
corsProxy: DEFAULT_CORS_PROXY_URL,
- }
+ },
]
-export const PROVIDERS_MAP = new Map(PROVIDERS.map(provider => [provider.id, provider]))
+export const PROVIDERS_MAP = new Map(
+ PROVIDERS.map(provider => [provider.id, provider]),
+)
export const svelteTarget: Element = document.body
diff --git a/assets/scripts/oauth-services-api/github.ts b/assets/scripts/oauth-services-api/github.ts
index de2b0cef..9456cba5 100644
--- a/assets/scripts/oauth-services-api/github.ts
+++ b/assets/scripts/oauth-services-api/github.ts
@@ -199,7 +199,7 @@ export default class GitHubAPI implements OAuthServiceAPI {
makeRepoId = defaultMakeRepoId
- makePublicRepositoryURL(owner: string, repoName: string ): string {
- return defaultMakePublicRepositoryURL(owner, repoName, 'https://github.com')
+ makePublicRepositoryURL(owner: string, repoName: string): string {
+ return defaultMakePublicRepositoryURL(owner, repoName, 'https://github.com')
}
}
diff --git a/assets/scripts/oauth-services-api/gitlab.ts b/assets/scripts/oauth-services-api/gitlab.ts
index 94aba3f3..a04a24c0 100644
--- a/assets/scripts/oauth-services-api/gitlab.ts
+++ b/assets/scripts/oauth-services-api/gitlab.ts
@@ -240,7 +240,7 @@ export default class GitLabAPI implements OAuthServiceAPI {
makeRepoId = defaultMakeRepoId
- makePublicRepositoryURL(owner: string, repoName: string ): string {
- return defaultMakePublicRepositoryURL(owner, repoName, this.origin)
+ makePublicRepositoryURL(owner: string, repoName: string): string {
+ return defaultMakePublicRepositoryURL(owner, repoName, this.origin)
}
}
diff --git a/assets/scripts/oauth-services-api/index.ts b/assets/scripts/oauth-services-api/index.ts
index d5919e05..a109ac61 100644
--- a/assets/scripts/oauth-services-api/index.ts
+++ b/assets/scripts/oauth-services-api/index.ts
@@ -55,7 +55,6 @@ export const getOAuthServiceAPI = (): OAuthServiceAPI => {
return oAuthServiceAPI
}
-
/**
* @param owner may be an individual Github user or an organisation
*/
diff --git a/assets/scripts/oauth-services-api/scribouilli.ts b/assets/scripts/oauth-services-api/scribouilli.ts
index acc1779d..77ba7cd9 100644
--- a/assets/scripts/oauth-services-api/scribouilli.ts
+++ b/assets/scripts/oauth-services-api/scribouilli.ts
@@ -1,142 +1,167 @@
import ScribouilliGitRepo from '../scribouilliGitRepo.ts'
-import type { BuildStatus, GithubRepository, GitSiteTemplate, OAuthServiceAPI } from '../types/git.ts'
+import type {
+ BuildStatus,
+ GithubRepository,
+ GitSiteTemplate,
+ OAuthServiceAPI,
+} from '../types/git.ts'
export default class ScribouilliBackend implements OAuthServiceAPI {
-
- private accessToken: string | undefined
- private origin
- private authenticatedUser:
- | undefined
- | { id: string, login: string, email: string }
-
- constructor(accessToken: string, origin: string) {7
- this.accessToken = accessToken
- this.origin = origin
- this.authenticatedUser = undefined
+ private accessToken: string | undefined
+ private origin
+ private authenticatedUser:
+ | undefined
+ | { id: string; login: string; email: string }
+
+ constructor(accessToken: string, origin: string) {
+ 7
+ this.accessToken = accessToken
+ this.origin = origin
+ this.authenticatedUser = undefined
+ }
+
+ get apiBaseUrl() {
+ return `${this.origin}/api`
+ }
+
+ async callAPI(url: string, requestParams: RequestInit = {}) {
+ requestParams.headers ??= {}
+ requestParams.headers['Authorization'] = 'Bearer ' + this.accessToken
+
+ const httpResp = await fetch(`${this.apiBaseUrl}${url}`, requestParams)
+ if (httpResp.status === 404) {
+ throw 'NOT_FOUND'
}
-
- get apiBaseUrl() {
- return `${this.origin}/api`
+ if (httpResp.status === 401) {
+ this.accessToken = undefined
+ console.debug('this accessToken : ', this.accessToken)
+ throw 'INVALIDATE_TOKEN'
}
+ return httpResp
+ }
- async callAPI(url: string, requestParams: RequestInit = {}) {
- requestParams.headers ??= {}
- requestParams.headers['Authorization'] = 'Bearer ' + this.accessToken
-
- const httpResp = await fetch(`${this.apiBaseUrl}${url}`, requestParams)
- if (httpResp.status === 404) {
- throw 'NOT_FOUND'
- }
- if (httpResp.status === 401) {
- this.accessToken = undefined
- console.debug('this accessToken : ', this.accessToken)
- throw 'INVALIDATE_TOKEN'
- }
- return httpResp
+ getOauthUsernameAndPassword() {
+ if (!this.accessToken) {
+ throw new TypeError('Missing accessToken')
}
- getOauthUsernameAndPassword() {
- if (!this.accessToken) {
- throw new TypeError('Missing accessToken')
- }
-
- return { username: 'token', password: this.accessToken }
- }
-
-
- async getAuthenticatedUser() {
- if (this.authenticatedUser) {
- return this.authenticatedUser
- }
+ return { username: 'token', password: this.accessToken }
+ }
- const response = await this.callAPI(`/profile`)
- const user = await response.json()
- this.authenticatedUser = {
- login: user.email,
- email: user.email,
- id: user.id,
- }
- return this.authenticatedUser
+ async getAuthenticatedUser() {
+ if (this.authenticatedUser) {
+ return this.authenticatedUser
}
- async getUserEmails() {
- const { email } = await this.getAuthenticatedUser();
- return [{
- email,
- primary: true
- }]
+ const response = await this.callAPI(`/profile`)
+ const user = await response.json()
+ this.authenticatedUser = {
+ login: user.email,
+ email: user.email,
+ id: user.id,
}
-
- async createDefaultRepository(scribouilliGitRepo: ScribouilliGitRepo, template: GitSiteTemplate): Promise<{ remoteURL: string; }> {
- const { repoName } = scribouilliGitRepo;
- await this.callAPI(`/websites`, {
- method: 'POST',
- headers: {
- 'content-type': 'application/json'
- },
- body: JSON.stringify({
- name: repoName,
- template_url: template.url,
- })
- })
-
- return {remoteURL: this.makePublicRepositoryURL('', repoName)}
- }
-
- async isRepositoryReady(scribouilliGitRepo: ScribouilliGitRepo): Promise {
- const response = await this.callAPI(`/websites/${scribouilliGitRepo.repoName}/ready`)
- const { is_ready } = await response.json()
- return is_ready
- }
-
- async getCurrentUserRepositories(): Promise {
- const response = await this.callAPI(`/websites`)
- const repos = await response.json()
- const { email } = await this.getAuthenticatedUser();
- // @ts-ignore
- const githubRepos = repos.map(repo => {
- return {
- id: repo.name,
- name: repo.name,
- owner: {
- login: email
- }
- }
- })
- return githubRepos
-
- }
-
- async deploy(scribouilliGitRepo: ScribouilliGitRepo): Promise {
- await this.callAPI(`/websites/${scribouilliGitRepo.repoName}/deployment`, { method: 'POST'})
- }
-
- async getPagesWebsiteDeploymentStatus(scribouilliGitRepo: ScribouilliGitRepo): Promise {
- const data = await this.callAPI(`/websites/${scribouilliGitRepo.repoName}/deployment`)
- const { status } = await data.json();
- return status
- }
-
- async isPagesWebsiteBuilt(scribouilliGitRepo: ScribouilliGitRepo): Promise {
- try {
- const response = await this.getPagesWebsiteDeploymentStatus(scribouilliGitRepo)
- return response === 'success'
- } catch {
- return false
- }
- }
-
- async getPublishedWebsiteURL(scribouilliGitRepo: ScribouilliGitRepo): Promise {
- const data = await this.callAPI(`/websites/${scribouilliGitRepo.repoName}/url`)
- const { url } = await data.json();
- return url
- }
-
- makeRepoId(_owner: string, repoName: string): string {
- return `websites/${repoName}`
- }
-
- makePublicRepositoryURL(_owner: string, repoName: string ): string {
- return `${this.origin}/websites/${repoName}`
+ return this.authenticatedUser
+ }
+
+ async getUserEmails() {
+ const { email } = await this.getAuthenticatedUser()
+ return [
+ {
+ email,
+ primary: true,
+ },
+ ]
+ }
+
+ async createDefaultRepository(
+ scribouilliGitRepo: ScribouilliGitRepo,
+ template: GitSiteTemplate,
+ ): Promise<{ remoteURL: string }> {
+ const { repoName } = scribouilliGitRepo
+ await this.callAPI(`/websites`, {
+ method: 'POST',
+ headers: {
+ 'content-type': 'application/json',
+ },
+ body: JSON.stringify({
+ name: repoName,
+ template_url: template.url,
+ }),
+ })
+
+ return { remoteURL: this.makePublicRepositoryURL('', repoName) }
+ }
+
+ async isRepositoryReady(
+ scribouilliGitRepo: ScribouilliGitRepo,
+ ): Promise {
+ const response = await this.callAPI(
+ `/websites/${scribouilliGitRepo.repoName}/ready`,
+ )
+ const { is_ready } = await response.json()
+ return is_ready
+ }
+
+ async getCurrentUserRepositories(): Promise {
+ const response = await this.callAPI(`/websites`)
+ const repos = await response.json()
+ const { email } = await this.getAuthenticatedUser()
+ // @ts-ignore
+ const githubRepos = repos.map(repo => {
+ return {
+ id: repo.name,
+ name: repo.name,
+ owner: {
+ login: email,
+ },
+ }
+ })
+ return githubRepos
+ }
+
+ async deploy(scribouilliGitRepo: ScribouilliGitRepo): Promise {
+ await this.callAPI(`/websites/${scribouilliGitRepo.repoName}/deployment`, {
+ method: 'POST',
+ })
+ }
+
+ async getPagesWebsiteDeploymentStatus(
+ scribouilliGitRepo: ScribouilliGitRepo,
+ ): Promise {
+ const data = await this.callAPI(
+ `/websites/${scribouilliGitRepo.repoName}/deployment`,
+ )
+ const { status } = await data.json()
+ return status
+ }
+
+ async isPagesWebsiteBuilt(
+ scribouilliGitRepo: ScribouilliGitRepo,
+ ): Promise {
+ try {
+ const response =
+ await this.getPagesWebsiteDeploymentStatus(scribouilliGitRepo)
+ return response === 'success'
+ } catch {
+ return false
}
+ }
+
+ async getPublishedWebsiteURL(
+ scribouilliGitRepo: ScribouilliGitRepo,
+ ): Promise {
+ const data = await this.callAPI(
+ `/websites/${scribouilliGitRepo.repoName}/url`,
+ )
+ const { url } = await data.json()
+ return url
+ }
+
+ makeRepoId(_owner: string, repoName: string): string {
+ return `websites/${repoName}`
+ }
+
+ makePublicRepositoryURL(_owner: string, repoName: string): string {
+ return `${this.origin}/websites/${repoName}`
+ }
}
diff --git a/assets/scripts/routes/account.ts b/assets/scripts/routes/account.ts
index 535a5d77..5f32cb36 100644
--- a/assets/scripts/routes/account.ts
+++ b/assets/scripts/routes/account.ts
@@ -13,7 +13,7 @@ export default ({ querystring }: Context) => {
throw new TypeError(`Missing 'provider' parameter`)
}
- const provider = PROVIDERS_MAP.get(providerId);
+ const provider = PROVIDERS_MAP.get(providerId)
if (!provider) {
throw new TypeError(`Unkown provider ${providerId}`)
diff --git a/assets/scripts/routes/login.ts b/assets/scripts/routes/login.ts
index 325d29c4..152634d4 100644
--- a/assets/scripts/routes/login.ts
+++ b/assets/scripts/routes/login.ts
@@ -6,15 +6,13 @@ import {
TOCTOCTOC_ORIGIN,
TOCTOCTOC_OAUTH_PROVIDER_ORIGIN_PARAMETER,
TOCTOCTOC_OAUTH_PROVIDER_URL_PARAMETER,
- PROVIDERS_MAP
+ PROVIDERS_MAP,
} from '../config'
import { ScribouilliBackendProvider } from '../types/atelier'
-
-
function redirectURLByProvider(
{ type: providerType, origin }: ScribouilliBackendProvider,
- destination: string
+ destination: string,
) {
if (providerType === 'github') {
return `${TOCTOCTOC_ORIGIN}/github-callback?destination=${destination}`
@@ -29,7 +27,7 @@ function redirectURLByProvider(
}
function makeLoginHref(
- {clientId, type: providerType, origin}: ScribouilliBackendProvider,
+ { clientId, type: providerType, origin }: ScribouilliBackendProvider,
redirectUrl: string,
) {
if (providerType === 'github') {
@@ -51,9 +49,8 @@ export default ({ querystring }: Context) => {
throw new TypeError(`Missing 'provider' parameter`)
}
-
const destination =
- location.origin + store.state.basePath + '/after-oauth-login'
+ location.origin + store.state.basePath + '/after-oauth-login'
const provider = PROVIDERS_MAP.get(gitProvider)
diff --git a/assets/scripts/scribouilliGitRepo.ts b/assets/scripts/scribouilliGitRepo.ts
index 50e6af6d..cd2bd85d 100644
--- a/assets/scripts/scribouilliGitRepo.ts
+++ b/assets/scripts/scribouilliGitRepo.ts
@@ -23,16 +23,21 @@ export default class ScribouilliGitRepo {
origin: string
owner: string
repoName: string
- repoType: BackendType,
+ repoType: BackendType
gitServiceProvider: OAuthServiceAPI
}) {
this.origin = origin
- this.publicRepositoryURL = gitServiceProvider.makePublicRepositoryURL(owner, repoName)
+ this.publicRepositoryURL = gitServiceProvider.makePublicRepositoryURL(
+ owner,
+ repoName,
+ )
this.owner = owner
this.repoName = repoName
this.repoType = repoType
- this.repoId = repoId ? repoId : gitServiceProvider.makeRepoId(owner, repoName)
+ this.repoId = repoId
+ ? repoId
+ : gitServiceProvider.makeRepoId(owner, repoName)
this.publishedWebsiteURL = new Promise(resolve => {
const interval = setInterval(() => {
diff --git a/assets/scripts/types/atelier.ts b/assets/scripts/types/atelier.ts
index eb3a6a6c..d9aa8d04 100644
--- a/assets/scripts/types/atelier.ts
+++ b/assets/scripts/types/atelier.ts
@@ -32,20 +32,17 @@ export interface FileContenu {
blogIndex: boolean
}
-export type BackendType =
- | 'github'
- | 'gitlab'
- | 'scribouilli'
+export type BackendType = 'github' | 'gitlab' | 'scribouilli'
export interface ScribouilliBackendProvider {
- id: string,
- origin: string,
- clientId?: string,
- type: BackendType,
- description: string,
- name: string,
- signupInstructions?: string,
- signupEnabled: boolean,
- signupLink?: string,
- corsProxy?: string,
+ id: string
+ origin: string
+ clientId?: string
+ type: BackendType
+ description: string
+ name: string
+ signupInstructions?: string
+ signupEnabled: boolean
+ signupLink?: string
+ corsProxy?: string
}
diff --git a/assets/scripts/types/git.ts b/assets/scripts/types/git.ts
index 462c1897..e8dbfe84 100644
--- a/assets/scripts/types/git.ts
+++ b/assets/scripts/types/git.ts
@@ -1,10 +1,10 @@
-import { BackendType } from "./atelier"
+import { BackendType } from './atelier'
interface ScribouilliGitRepo {
repoId: string
owner: string
repoName: string
- repoType: BackendType,
+ repoType: BackendType
origin: string
publishedWebsiteURL: Promise
publicRepositoryURL: string
diff --git a/assets/styles/styles.css b/assets/styles/styles.css
index a91c3ad7..ac52d154 100644
--- a/assets/styles/styles.css
+++ b/assets/styles/styles.css
@@ -377,5 +377,5 @@ ul.list-with-dot {
text-align: left;
list-style-type: disc;
list-style-position: inside;
- }
+ }
}
From 404e9321ea8fd1498920068276bc4ba2893000f3 Mon Sep 17 00:00:00 2001
From: Ana Gelez
Date: Sat, 29 Aug 2026 15:59:25 +0200
Subject: [PATCH 5/8] Fix HTTP header typing
---
assets/scripts/oauth-services-api/scribouilli.ts | 5 ++++-
assets/scripts/types/git.ts | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/assets/scripts/oauth-services-api/scribouilli.ts b/assets/scripts/oauth-services-api/scribouilli.ts
index 77ba7cd9..bafcb03b 100644
--- a/assets/scripts/oauth-services-api/scribouilli.ts
+++ b/assets/scripts/oauth-services-api/scribouilli.ts
@@ -24,7 +24,10 @@ export default class ScribouilliBackend implements OAuthServiceAPI {
return `${this.origin}/api`
}
- async callAPI(url: string, requestParams: RequestInit = {}) {
+ async callAPI(
+ url: string,
+ requestParams: RequestInit & { headers?: Record } = {},
+ ) {
requestParams.headers ??= {}
requestParams.headers['Authorization'] = 'Bearer ' + this.accessToken
diff --git a/assets/scripts/types/git.ts b/assets/scripts/types/git.ts
index e8dbfe84..2273403a 100644
--- a/assets/scripts/types/git.ts
+++ b/assets/scripts/types/git.ts
@@ -23,7 +23,10 @@ export type BuildStatus =
| 'needs_account_verification'
export interface OAuthServiceAPI {
- callAPI: (url: string, requestParams?: RequestInit) => Promise
+ callAPI: (
+ url: string,
+ requestParams?: RequestInit & { headers?: Record },
+ ) => Promise
getOauthUsernameAndPassword: () => { username: string; password: string }
getAuthenticatedUser: () => Promise
getUserEmails: () => Promise
From ee97ace9a04e938340133549b2d3380a826abb62 Mon Sep 17 00:00:00 2001
From: Ana Gelez
Date: Sat, 29 Aug 2026 16:06:35 +0200
Subject: [PATCH 6/8] Properly type API interactions
---
assets/scripts/oauth-services-api/scribouilli.ts | 13 +++++++++++--
package-lock.json | 12 +++++++++++-
package.json | 3 ++-
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/assets/scripts/oauth-services-api/scribouilli.ts b/assets/scripts/oauth-services-api/scribouilli.ts
index bafcb03b..31b42bcf 100644
--- a/assets/scripts/oauth-services-api/scribouilli.ts
+++ b/assets/scripts/oauth-services-api/scribouilli.ts
@@ -5,6 +5,15 @@ import type {
GitSiteTemplate,
OAuthServiceAPI,
} from '../types/git.ts'
+import z from 'zod'
+
+const WEBSITE_LIST_SCHEMA = z.array(
+ z.object({
+ name: z.string(),
+ is_ready: z.boolean(),
+ role: z.union([z.literal('editor'), z.literal('owner')]),
+ }),
+)
export default class ScribouilliBackend implements OAuthServiceAPI {
private accessToken: string | undefined
@@ -107,9 +116,9 @@ export default class ScribouilliBackend implements OAuthServiceAPI {
async getCurrentUserRepositories(): Promise {
const response = await this.callAPI(`/websites`)
- const repos = await response.json()
+ const rawRepos = await response.json()
+ const repos = z.parse(WEBSITE_LIST_SCHEMA, rawRepos)
const { email } = await this.getAuthenticatedUser()
- // @ts-ignore
const githubRepos = repos.map(repo => {
return {
id: repo.name,
diff --git a/package-lock.json b/package-lock.json
index 4ce00845..567cc4b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,8 @@
"js-yaml": "^3.14.1",
"marked": "^11.0.0",
"page": "^1.11.6",
- "remember": "github:DavidBruant/remember#v1.0.2"
+ "remember": "github:DavidBruant/remember#v1.0.2",
+ "zod": "^4.5.2"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^29.0.3",
@@ -8041,6 +8042,15 @@
"integrity": "sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==",
"dev": true,
"license": "MIT"
+ },
+ "node_modules/zod": {
+ "version": "4.5.2",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-4.5.2.tgz",
+ "integrity": "sha512-XkYXCol10+ba/6F/cueWV+TezUeOqXW0hdeJt5CdXjTYeAgAQg5N03RQdJ80mhfFE72+pblvYMW4wy2Qp4Qbrg==",
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/colinhacks"
+ }
}
}
}
diff --git a/package.json b/package.json
index 36e3371f..5fb6a562 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
"js-yaml": "^3.14.1",
"marked": "^11.0.0",
"page": "^1.11.6",
- "remember": "github:DavidBruant/remember#v1.0.2"
+ "remember": "github:DavidBruant/remember#v1.0.2",
+ "zod": "^4.5.2"
}
}
From cacdd816c8fdaf74458ba8d4fe36f6d0959b1202 Mon Sep 17 00:00:00 2001
From: Hannaeko
Date: Sat, 29 Aug 2026 16:11:25 +0200
Subject: [PATCH 7/8] remove todo comment
---
assets/scripts/routes/login.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/assets/scripts/routes/login.ts b/assets/scripts/routes/login.ts
index 152634d4..4d506e7a 100644
--- a/assets/scripts/routes/login.ts
+++ b/assets/scripts/routes/login.ts
@@ -19,7 +19,6 @@ function redirectURLByProvider(
} else if (providerType === 'gitlab') {
return `${TOCTOCTOC_ORIGIN}/gitlab-callback/${origin}/?destination=${destination}`
} else if (providerType === 'scribouilli') {
- // TODO: get rid of origin parameter when not used?
return `${destination}?${TOCTOCTOC_OAUTH_PROVIDER_URL_PARAMETER}=scribouilli&${TOCTOCTOC_OAUTH_PROVIDER_ORIGIN_PARAMETER}=${origin}`
} else {
throw new Error('unreachable')
From 46e4b4e9c79301e0d26fd1742553cfffab833771 Mon Sep 17 00:00:00 2001
From: Hannaeko
Date: Sat, 29 Aug 2026 16:51:31 +0200
Subject: [PATCH 8/8] fix tests
---
assets/scripts/GitAgent.ts | 2 +-
assets/scripts/components/Header.svelte | 2 +-
assets/scripts/config.ts | 2 +-
assets/scripts/scribouilliGitRepo.ts | 2 +-
assets/scripts/types/git.ts | 2 +-
tests/actions/current-repository.test.ts | 4 +++-
6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/assets/scripts/GitAgent.ts b/assets/scripts/GitAgent.ts
index 48098e59..ff0319d0 100644
--- a/assets/scripts/GitAgent.ts
+++ b/assets/scripts/GitAgent.ts
@@ -15,7 +15,7 @@ import http from 'isomorphic-git/http/web'
import type { CommitObject } from 'isomorphic-git'
import type { ResolutionOption } from './store.ts'
-import { OAuthServiceAPI } from './types/git.ts'
+import type { OAuthServiceAPI } from './types/git.ts'
export default class GitAgent {
#fs
diff --git a/assets/scripts/components/Header.svelte b/assets/scripts/components/Header.svelte
index 8153c2de..1b982e9e 100644
--- a/assets/scripts/components/Header.svelte
+++ b/assets/scripts/components/Header.svelte
@@ -1,7 +1,7 @@