Merge pull request #21212 from overleaf/revert-20969-ac-subscription-layout-react

Revert "[web] Set Subscription pages to have `layout-react`"

GitOrigin-RevId: eaf3a651160e278adcb103864c5ea81ea3e35aa7

services/web/app/src/Features/Authentication/SessionManager.js

@@ -1,12 +1,6 @@
 const _ = require('lodash')
 
-/** @typedef {import('../../../../types/user').User} User */
-
 const SessionManager = {
-  /**
-   * @param session
-   * @returns {User | null}
-   */
   getSessionUser(session) {
     const sessionUser = _.get(session, ['user'])
     const sessionPassportUser = _.get(session, ['passport', 'user'])

services/web/app/src/Features/Subscription/TeamInvitesController.mjs

@@ -169,16 +169,12 @@ async function viewInvite(req, res, next) {
       invite.email
     )
 
-    /** @type {import('../../../../types/user').LoggedOutUser} */
-    const userWithoutSensitiveFields = { id: null }
-
     return res.render('subscriptions/team/invite_logged_out', {
       inviterName: invite.inviterName,
       inviteToken: invite.token,
       appName: settings.appName,
       accountExists: userByEmail != null,
       emailAddress: invite.email,
-      userWithoutSensitiveFields,
     })
   }
 }

services/web/app/views/layout-react.pug

@@ -37,7 +37,6 @@ block append meta
 			subdomainLang: settings.i18n.subdomainLang,
 			translatedLanguages: settings.translatedLanguages
 		})
-		meta(name="ol-user" data-type="json" content=(userWithoutSensitiveFields || getSessionUser()))
 
 block body
 	if (typeof suppressNavbar === "undefined")

services/web/app/views/subscriptions/canceled-subscription-react.pug

@@ -1,4 +1,4 @@
-extends ../layout-react
+extends ../layout-marketing
 
 block vars
 	- bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly'

services/web/app/views/subscriptions/dashboard-react.pug

@@ -1,4 +1,4 @@
-extends ../layout-react
+extends ../layout-marketing
 
 block vars
 	- bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly'

services/web/app/views/subscriptions/successful-subscription-react.pug

@@ -1,4 +1,4 @@
-extends ../layout-react
+extends ../layout-marketing
 
 block vars
 	- bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly'

services/web/app/views/subscriptions/team/group-invites.pug

@@ -1,4 +1,4 @@
-extends ../../layout-react
+extends ../../layout-marketing
 
 block vars
 	- bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly'

services/web/app/views/subscriptions/team/invite-managed.pug

@@ -1,4 +1,4 @@
-extends ../../layout-react
+extends ../../layout-marketing
 
 block vars
 	- bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly'

services/web/app/views/subscriptions/team/invite.pug

@@ -1,4 +1,4 @@
-extends ../../layout-react
+extends ../../layout-marketing
 
 block vars
 	- bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly'

services/web/app/views/subscriptions/team/invite_logged_out.pug

@@ -1,4 +1,4 @@
-extends ../../layout-react
+extends ../../layout-marketing
 
 block vars
 	- bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly'

services/web/frontend/js/pages/user/subscription/base.js

@@ -6,4 +6,3 @@ import '../../../features/contact-form'
 import '../../../features/event-tracking'
 import '../../../features/cookie-banner'
 import '../../../features/link-helpers/slow-link'
-import '../../../features/header-footer-react'

services/web/frontend/js/shared/context/user-context.tsx

@@ -1,10 +1,8 @@
 import { createContext, FC, useContext, useMemo } from 'react'
 import getMeta from '../../utils/meta'
-import { LoggedOutUser, User } from '../../../../types/user'
+import { User } from '../../../../types/user'
 
-export const UserContext = createContext<User | LoggedOutUser | undefined>(
-  undefined
-)
+export const UserContext = createContext<User | undefined>(undefined)
 
 export const UserProvider: FC = ({ children }) => {
   const user = useMemo(() => getMeta('ol-user'), [])

services/web/frontend/js/utils/meta.ts

@@ -1,4 +1,4 @@
-import { User, Features, LoggedOutUser } from '../../../types/user'
+import { User, Features } from '../../../types/user'
 import { User as MinimalUser } from '../../../types/admin/user'
 import { User as ManagedUser } from '../../../types/group-management/user'
 import { UserSettings } from '../../../types/user-settings'
@@ -204,7 +204,7 @@ export interface Meta {
   'ol-usGovBannerVariant': USGovBannerVariant
   'ol-useShareJsHash': boolean
   'ol-usedLatex': 'never' | 'occasionally' | 'often' | undefined
-  'ol-user': User | LoggedOutUser
+  'ol-user': User
   'ol-userAffiliations': Affiliation[]
   'ol-userCanExtendTrial': boolean
   'ol-userCanNotStartRequestedTrial': boolean

services/web/types/user.ts

@@ -46,20 +46,4 @@ export type User = {
   }
 }
 
-export type LoggedOutUser = {
-  id: null
-  email?: undefined
-  first_name?: undefined
-  last_name?: undefined
-  signUpDate?: undefined
-  labsProgram?: boolean
-  alphaProgram?: boolean
-  betaProgram?: boolean
-  allowedFreeTrial?: boolean
-  features?: Features
-  refProviders?: RefProviders
-  writefull?: undefined
-  isAdmin?: boolean
-}
-
 export type MongoUser = Pick<User, Exclude<keyof User, 'id'>> & { _id: string }