Эх сурвалжийг харах

Merge pull request #25351 from overleaf/revert-24919-jel-create-group-audit-log

Revert "[web] Add group audit log"

GitOrigin-RevId: cf192bbe3ebdb693f18bab9c1c5d08da18ed34c0
Jessica Lawshe 1 жил өмнө
parent
commit
12939b91b3

+ 0 - 1
services/web/app/src/infrastructure/mongodb.js

@@ -49,7 +49,6 @@ const db = {
   githubSyncUserCredentials: internalDb.collection('githubSyncUserCredentials'),
   globalMetrics: internalDb.collection('globalMetrics'),
   grouppolicies: internalDb.collection('grouppolicies'),
-  groupAuditLogEntries: internalDb.collection('groupAuditLogEntries'),
   institutions: internalDb.collection('institutions'),
   messages: internalDb.collection('messages'),
   migrations: internalDb.collection('migrations'),

+ 0 - 23
services/web/app/src/models/GroupAuditLogEntry.js

@@ -1,23 +0,0 @@
-const mongoose = require('../infrastructure/Mongoose')
-const { Schema } = mongoose
-
-const GroupAuditLogEntrySchema = new Schema(
-  {
-    groupId: { type: Schema.Types.ObjectId, index: true },
-    info: { type: Object },
-    initiatorId: { type: Schema.Types.ObjectId },
-    ipAddress: { type: String },
-    operation: { type: String },
-    timestamp: { type: Date, default: Date.now },
-  },
-  {
-    collection: 'groupAuditLogEntries',
-    minimize: false,
-  }
-)
-
-exports.GroupAuditLogEntry = mongoose.model(
-  'GroupAuditLogEntry',
-  GroupAuditLogEntrySchema
-)
-exports.GroupAuditLogEntrySchema = GroupAuditLogEntrySchema

+ 0 - 1
services/web/frontend/js/utils/meta.ts

@@ -103,7 +103,6 @@ export interface Meta {
   'ol-gitBridgeEnabled': boolean
   'ol-gitBridgePublicBaseUrl': string
   'ol-github': { enabled: boolean; error: boolean }
-  'ol-groupAuditLogs': []
   'ol-groupId': string
   'ol-groupName': string
   'ol-groupPlans': GroupPlans

+ 0 - 35
services/web/migrations/20250409155536_group_audit_log_index.mjs

@@ -1,35 +0,0 @@
-/* eslint-disable no-unused-vars */
-
-import Helpers from './lib/helpers.mjs'
-
-const tags = ['saas']
-
-const indexes = [
-  {
-    key: {
-      groupId: 1,
-      timestamp: 1,
-    },
-    name: 'groupId_1_timestamp_1',
-  },
-]
-
-const migrate = async client => {
-  const { db } = client
-  await Helpers.addIndexesToCollection(db.groupAuditLogEntries, indexes)
-}
-
-const rollback = async client => {
-  const { db } = client
-  try {
-    await Helpers.dropIndexesFromCollection(db.groupAuditLogEntries, indexes)
-  } catch (err) {
-    console.error('Something went wrong rolling back the migrations', err)
-  }
-}
-
-export default {
-  tags,
-  migrate,
-  rollback,
-}

+ 8 - 10
services/web/test/acceptance/src/helpers/groupSSO.mjs

@@ -34,7 +34,7 @@ export const baseSsoConfig = {
   userIdAttribute,
 } // the database also sets enabled and validated, but we cannot set that in the POST request for /manage/groups/:ID/settings/sso
 
-export async function createGroupSSO(SSOConfigValidated = true) {
+export async function createGroupSSO() {
   const nonSSOMemberHelper = await UserHelper.createUser()
   const nonSSOMember = nonSSOMemberHelper.user
 
@@ -47,7 +47,7 @@ export async function createGroupSSO(SSOConfigValidated = true) {
   const ssoConfig = new SSOConfig({
     ...baseSsoConfig,
     enabled: true,
-    validated: SSOConfigValidated,
+    validated: true,
   })
 
   await ssoConfig.save()
@@ -68,14 +68,12 @@ export async function createGroupSSO(SSOConfigValidated = true) {
   const enrollmentUrl = getEnrollmentUrl(subscriptionId)
   const internalProviderId = getProviderId(subscriptionId)
 
-  if (SSOConfigValidated) {
-    await linkGroupMember(
-      memberUser.email,
-      memberUser.password,
-      subscriptionId,
-      'mock@email.com'
-    )
-  }
+  await linkGroupMember(
+    memberUser.email,
+    memberUser.password,
+    subscriptionId,
+    'mock@email.com'
+  )
 
   const userHelper = new UserHelper()