Move session to root layout data.

src/app.d.ts

@@ -2,51 +2,8 @@
 
 declare namespace App {
   interface Locals {
-    user?: User
+    user?: import("$lib/users").User
   }
 
   // interface Platform {}
-
-  interface Session {
-    advanced: boolean
-    apiBaseUrls: string[]
-    apiWebSocketBaseUrls: string[]
-    baseUrl: string
-    authenticationEnabled: boolean
-    childrenKey: string
-    familyEntityKey: string
-    hasGithubPersonalAccessToken: boolean
-    hiddenEntitiesKeyPlural?: string[]
-    householdEntityKey: string
-    legalUrl: string
-    matomo?: {
-      prependDomain?: boolean
-      siteId: number
-      subdomains?: string
-      url: string
-    }
-    openfiscaRepository: import("$lib/repositories").RepositoryConfig
-    portalUrl: string
-    reformName?: string
-    showTutorial?: boolean
-    taxableHouseholdEntityKey: string
-    territoiresUrl: string
-    title: string
-    user?: User
-  }
-
-  // interface Stuff {}
-
-  export interface User {
-    email: string // "john@doe.com"
-    email_verified: boolean
-    family_name: string // "Doe"
-    given_name: string // "John"
-    last_name: string // "Doe"
-    locale: string // "fr"
-    name: string // "John Doe"
-    preferred_username: string // "jdoe",
-    roles?: string[] // [ 'offline_access', 'default-roles-leximpact', 'uma_authorization' ],
-    sub: string // "12345678-9abc-def0-1234-56789abcdef0"
-  }
 }

src/lib/server/oauth2.ts

@@ -2,8 +2,9 @@ import { SvelteKitAuth } from "sk-auth"
 import { OAuth2Provider } from "sk-auth/providers"
 
 import config from "$lib/server/config"
+import type { User } from "$lib/users"
 
-type Profile = App.User
+type Profile = User
 
 interface Tokens {
   access_token: string

src/routes/+layout.server.ts

+import type { User } from "$lib/users"
 import config from "$lib/server/config"
 import { oauth2Authenticator } from "$lib/server/oauth2"
 
@@ -5,7 +6,35 @@ import type { LayoutServerLoad } from "./$types"
 
 const { githubPersonalAccessToken, openfiscaRepository } = config
 
-export const load: LayoutServerLoad = async (event) => {
+export const load: LayoutServerLoad = async (
+  event,
+): Promise<{
+  advanced: boolean
+  apiBaseUrls: string[]
+  apiWebSocketBaseUrls: string[]
+  baseUrl: string
+  authenticationEnabled: boolean
+  childrenKey: string
+  familyEntityKey: string
+  hasGithubPersonalAccessToken: boolean
+  hiddenEntitiesKeyPlural?: string[]
+  householdEntityKey: string
+  legalUrl: string
+  matomo?: {
+    prependDomain?: boolean
+    siteId: number
+    subdomains?: string
+    url: string
+  }
+  openfiscaRepository: import("$lib/repositories").RepositoryConfig
+  portalUrl: string
+  reformName?: string
+  showTutorial?: boolean
+  taxableHouseholdEntityKey: string
+  territoiresUrl: string
+  title: string
+  user?: User
+}> => {
   const oauth2Session = await oauth2Authenticator?.getSession(event)
   const user = oauth2Session?.user
   return {