fix: signin with page.ts, signOut fix in layout

apps/console/src/lib/server/middleware/auth.ts

@@ -18,7 +18,7 @@ export const log = new Logger('server:middleware:auth');
  */
 export const auth = (async ({ event, resolve }) => {
   const { url, cookies } = event;
-  log.debug('auth: pathname:', url.pathname);
+  log.debug('pathname:', url.pathname);
 
   const sessionCookieValue = cookies.get(NHOST_SESSION_KEY);
   const initialSession = sessionCookieValue ? (JSON.parse(atob(sessionCookieValue)) as NhostSession) : undefined;
@@ -32,6 +32,7 @@ export const auth = (async ({ event, resolve }) => {
   const currentTime = Math.floor(Date.now() / 1000);
   const tokenExpirationTime = nhost.auth.getDecodedAccessToken()?.exp;
   const accessTokenExpired = session && tokenExpirationTime && currentTime > tokenExpirationTime;
+  log.debug({ accessTokenExpired, refreshToken });
 
   if (accessTokenExpired || refreshToken) {
     log.debug('in accessTokenExpired || refreshToken');

apps/console/src/routes/(auth)/signin/+page.server.ts

@@ -12,6 +12,7 @@ import { zod } from 'sveltekit-superforms/adapters';
 
 const log = new Logger('server:auth:signin');
 
+/*
 export const load = async (event) => {
   const {
     locals: { nhost },
@@ -27,6 +28,7 @@ export const load = async (event) => {
   const pwlForm = await superValidate(zod(pwlSchema));
   return { pwForm, pwlForm };
 };
+*/
 
 export const actions = {
   password: async (event) => {

apps/console/src/routes/(auth)/signin/+page.ts

@@ -0,0 +1,14 @@
+import { i18n } from '$lib/i18n';
+import { pwSchema, pwlSchema } from '$lib/schema/user';
+import { isAuthenticated } from '$lib/stores/user';
+import { redirect } from '@sveltejs/kit';
+import { get } from 'svelte/store';
+import { superValidate } from 'sveltekit-superforms';
+import { zod } from 'sveltekit-superforms/adapters';
+
+export const load = async (event) => {
+  if (get(isAuthenticated)) redirect(302, i18n.resolveRoute('/dashboard'));
+  const pwForm = await superValidate(zod(pwSchema));
+  const pwlForm = await superValidate(zod(pwlSchema));
+  return { pwForm, pwlForm };
+};

apps/console/src/routes/(auth)/signup/+page.server.ts

@@ -10,44 +10,6 @@ import { zod } from 'sveltekit-superforms/adapters';
 
 const log = new Logger('server:auth:signup');
 
-/*
-const searchOrganizationsStore = new SearchOrganizationsStore();
-export const load = async (event) => {
-  const {
-    locals: { nhost },
-  } = event;
-  // Preflight prevents direct posting.
-  // If preflight option is true and this function isn't called
-  // before posting, request will be limited:
-  await limiter.cookieLimiter?.preflight(event);
-
-  const isAuthenticated = nhost.auth.isAuthenticated();
-  // log.debug({isAuthenticated});
-  if (isAuthenticated) redirectWithFlash(302, i18n.resolveRoute('/dashboard'));
-  const form = await superValidate(zod(signUpSchema));
-  // fetch orgs and render errors if backend throw error.
-  const { errors, data } = await searchOrganizationsStore.fetch({
-    event,
-    blocking: true,
-    metadata: { logResult: true, useRole: 'public' },
-    variables: {},
-  });
-  if (errors) {
-    for (const error of errors) {
-      log.error('list orgs api error', error);
-      // NOTE: you can add multiple errors, send all along with a message
-      setError(form, '', (error as GraphQLError).message);
-    }
-    setMessage(form, { type: 'error', message: 'List organizations failed' }, { status: 500 });
-    return { status: 500, form };
-  }
-  const organizations = data?.organizations.map((x) => x.organization);
-  if (!organizations) error(404, 'organizations not found');
-
-  return { organizations, form };
-};
-*/
-
 export const actions = {
   default: async (event) => {
     const {

apps/console/src/routes/+layout.svelte

@@ -98,7 +98,11 @@ $: if (browser) {
     nhost.auth.client.interpreter?.send('SESSION_UPDATE', { data: { session } });
   } else {
     log.debug('session empty, trigger SIGNOUT');
-    nhost.auth.client.interpreter?.send('SIGNOUT');
+    // nhost.auth.client.interpreter?.send('SIGNOUT');
+    (async () => {
+      const { error } = await nhost.auth.signOut();
+      if (error) log.error({ error })
+    })();
   }
 }