auth refactor

bedrockio · Feb 5, 2025 · 47d3916 · 47d3916
1 parent 37f9390
commit 47d3916
Show file tree

Hide file tree

Showing 130 changed files with 3,490 additions and 3,519 deletions.
diff --git a/services/api/.env b/services/api/.env
@@ -63,9 +63,12 @@ TWILIO_WEBHOOK_URL=
 TWILIO_AUTH_TOKEN=AC21717619d8cf45502cc2f7cd7aee139d
 
 # Sign in with Google
+# https://developers.google.com/identity/sign-in/web/sign-in
 GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
 
 # Sign in with Apple
+# https://developer.apple.com/help/account/configure-app-capabilities/about-sign-in-with-apple/
 APPLE_SERVICE_ID=
 
 # OpenAI

diff --git a/services/api/__mocks__/@simplewebauthn/server.js b/services/api/__mocks__/@simplewebauthn/server.js
@@ -1,15 +1,9 @@
-function generateAuthenticationOptions() {
+function generateAuthenticationOptions(options) {
   return {
-    rpId: 'rpID',
-    challenge: 'challenge',
-    allowCredentials: [
-      {
-        id: 'id',
-        type: 'public-key',
-        transports: ['hybrid', 'internal'],
-      },
-    ],
+    ...options,
+    rpID: 'rpID',
     timeout: 60000,
+    challenge: 'challenge',
     userVerification: 'preferred',
   };
 }
@@ -85,7 +79,7 @@ function verifyRegistrationResponse(options) {
       },
     };
   } else {
-    throw new Error('Bad register response.');
+    throw new Error('Bad registration response.');
   }
 }
 

diff --git a/services/api/__mocks__/google-auth-library.js b/services/api/__mocks__/google-auth-library.js
@@ -1,4 +1,11 @@
 class MockClient {
+  getToken(code) {
+    return {
+      tokens: {
+        id_token: code,
+      },
+    };
+  }
   verifyIdToken(options) {
     const { idToken } = options;
 
@@ -16,7 +23,7 @@ class MockClient {
   }
 }
 
-function createToken(payload) {
+function createCode(payload) {
   payload.givenName ||= 'First Name';
   payload.familyName ||= 'Last Name';
   payload.email_verified ??= true;
@@ -25,5 +32,5 @@ function createToken(payload) {
 
 module.exports = {
   OAuth2Client: MockClient,
-  createToken,
+  createCode,
 };
diff --git a/services/api/jest.config.js b/services/api/jest.config.js
@@ -2,9 +2,14 @@ process.env.ENV_NAME = 'test';
 process.env.LOG_LEVEL ||= 'warn';
 module.exports = {
   preset: '@shelf/jest-mongodb',
-  setupFilesAfterEnv: ['<rootDir>/src/utils/testing/setup/autoclean', '<rootDir>/src/utils/testing/setup/database'],
+  setupFilesAfterEnv: [
+    '<rootDir>/src/utils/testing/setup/autoclean',
+    '<rootDir>/src/utils/testing/setup/database',
+    '<rootDir>/src/utils/testing/setup/matchers',
+  ],
   // Only run on changed files without extra arguments.
   watchPlugins: ['./src/utils/testing/ChangedFilesPlugin'],
   // https://github.com/shelfio/jest-mongodb#6-jest-watch-mode-gotcha
   watchPathIgnorePatterns: ['globalConfig'],
+  maxWorkers: '50%',
 };