Merge pull request #3561 from quadratichq/revert-to-v0.20.5

Revert "Merge pull request #3547 from quadratichq/qa"

Author: jimniels

Cargo.toml

@@ -15,7 +15,7 @@ edition = "2024"
 description = "Infinite data grid with Python, JavaScript, and SQL built-in"
 repository = "https://github.com/quadratichq/quadratic"
 license-file = "LICENSE"
-version = "0.21.0"
+version = "0.20.5"
 
 
 [profile.release]

VERSION

@@ -1 +1 @@
-0.21.0
+0.20.5

package.json

@@ -1,6 +1,6 @@
 {
   "name": "quadratic",
-  "version": "0.21.0",
+  "version": "0.20.5",
   "author": {
     "name": "David Kircos",
     "email": "david@quadratichq.com",
@@ -71,7 +71,6 @@
     "docker:down": "docker compose --profile all --env-file .env.docker down",
     "docker:clean": "docker system prune -af && docker builder prune -af && docker volume prune -af",
     "e2e:test": "cd test/e2e && npm run docker:test",
-    "e2e:test:bail": "cd test/e2e && npm run docker:bail",
     "e2e:update": "cd test/e2e && npm run docker:update",
     "e2e:ui": "cd test/e2e && npm run test:ui",
     "e2e:headed": "cd test/e2e && npm run test:headed",

quadratic-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quadratic-api",
-  "version": "0.21.0",
+  "version": "0.20.5",
   "description": "",
   "main": "index.js",
   "scripts": {

quadratic-api/src/app.ts

@@ -9,7 +9,8 @@ import fs from 'fs';
 import helmet from 'helmet';
 import path from 'path';
 import winston from 'winston';
-import { CORS, LOG_REQUEST_INFO, NODE_ENV, SENTRY_DSN, VERSION } from './env-vars';
+import authRouter from './auth/router/authRouter';
+import { AUTH_CORS, CORS, LOG_REQUEST_INFO, NODE_ENV, SENTRY_DSN, VERSION } from './env-vars';
 import internal_router from './routes/internal';
 import { ApiError } from './utils/ApiError';
 import logger, { format } from './utils/logger';
@@ -31,6 +32,9 @@ app.use(helmet());
 // cookie parser for auth routes
 app.use(cookieParser());
 
+// workos auth
+app.use('/', cors({ origin: AUTH_CORS, credentials: true }), authRouter);
+
 // set CORS origin from env variable
 app.use(cors({ origin: CORS }));
 

quadratic-api/src/auth/providers/auth.ts

@@ -1,6 +1,19 @@
+import type { Request, Response } from 'express';
 import { AUTH_TYPE } from '../../env-vars';
 import { getUsersFromOry, jwtConfigOry } from './ory';
-import { getUsersFromWorkos, jwtConfigWorkos } from './workos';
+import {
+  authenticateWithCodeWorkos,
+  authenticateWithRefreshTokenWorkos,
+  clearCookiesWorkos,
+  getUsersFromWorkos,
+  jwtConfigWorkos,
+  loginWithPasswordWorkos,
+  logoutSessionWorkos,
+  resetPasswordWorkos,
+  sendResetPasswordWorkos,
+  signupWithPasswordWorkos,
+  verifyEmailWorkos,
+} from './workos';
 
 export type UsersRequest = {
   id: number;
@@ -43,3 +56,90 @@ export const jwtConfig = () => {
       throw new Error(`Unsupported auth type in jwtConfig(): ${AUTH_TYPE}`);
   }
 };
+
+export const loginWithPassword = async (args: { email: string; password: string; res: Response }) => {
+  switch (AUTH_TYPE) {
+    case 'workos':
+      return await loginWithPasswordWorkos(args);
+    default:
+      throw new Error(`Unsupported auth type in loginWithPassword(): ${AUTH_TYPE}`);
+  }
+};
+
+export const signupWithPassword = async (args: {
+  email: string;
+  password: string;
+  firstName: string;
+  lastName: string;
+  res: Response;
+}) => {
+  switch (AUTH_TYPE) {
+    case 'workos':
+      return await signupWithPasswordWorkos(args);
+    default:
+      throw new Error(`Unsupported auth type in signupWithPassword(): ${AUTH_TYPE}`);
+  }
+};
+
+export const authenticateWithCode = async (args: { code: string; res: Response }) => {
+  switch (AUTH_TYPE) {
+    case 'workos':
+      return await authenticateWithCodeWorkos(args);
+    default:
+      throw new Error(`Unsupported auth type in authenticateWithCode(): ${AUTH_TYPE}`);
+  }
+};
+
+export const authenticateWithRefreshToken = async (args: { req: Request; res: Response }) => {
+  switch (AUTH_TYPE) {
+    case 'workos':
+      return await authenticateWithRefreshTokenWorkos(args);
+    default:
+      throw new Error(`Unsupported auth type in authenticateWithRefreshToken(): ${AUTH_TYPE}`);
+  }
+};
+
+export const verifyEmail = async (args: { pendingAuthenticationToken: string; code: string; res: Response }) => {
+  switch (AUTH_TYPE) {
+    case 'workos':
+      return await verifyEmailWorkos(args);
+    default:
+      throw new Error(`Unsupported auth type in verifyEmail(): ${AUTH_TYPE}`);
+  }
+};
+
+export const logoutSession = async (args: { sessionId: string; res: Response }) => {
+  switch (AUTH_TYPE) {
+    case 'workos':
+      return await logoutSessionWorkos(args);
+    default:
+      throw new Error(`Unsupported auth type in logout(): ${AUTH_TYPE}`);
+  }
+};
+
+export const sendResetPassword = async (args: { email: string; res: Response }) => {
+  switch (AUTH_TYPE) {
+    case 'workos':
+      return await sendResetPasswordWorkos(args);
+    default:
+      throw new Error(`Unsupported auth type in sendResetPassword(): ${AUTH_TYPE}`);
+  }
+};
+
+export const resetPassword = async (args: { token: string; password: string; res: Response }) => {
+  switch (AUTH_TYPE) {
+    case 'workos':
+      return await resetPasswordWorkos(args);
+    default:
+      throw new Error(`Unsupported auth type in resetPassword(): ${AUTH_TYPE}`);
+  }
+};
+
+export const clearCookies = (args: { res: Response }) => {
+  switch (AUTH_TYPE) {
+    case 'workos':
+      return clearCookiesWorkos(args);
+    default:
+      throw new Error(`Unsupported auth type in clearCookies(): ${AUTH_TYPE}`);
+  }
+};