Merge branch 'dev' into dev-center

Author: brooketopcoder

src-ts/config/constants.ts

@@ -1,4 +1,5 @@
 export enum ToolTitle {
+    learn = 'Learn',
     settings = 'Account Settings',
     work = 'Work',
 }

src-ts/config/environments/environment.prod.config.ts

@@ -19,7 +19,7 @@ export const EnvironmentConfigProd: GlobalConfig = {
     },
     DISABLED_TOOLS: [ ],
     ENV: AppHostEnvironment.prod,
-    LEARN_SRC: 'https://fcc.topcoder.com:4431',
+    LEARN_SRC: 'https://freecodecamp.topcoder.com',
     // TODO: Move stripe creds to .env file
     STRIPE: {
         ADMIN_TOKEN:

src-ts/header/tool-selectors/tool-selectors-narrow/tool-selector-narrow/ToolSelectorNarrow.tsx

@@ -2,7 +2,7 @@ import classNames from 'classnames'
 import { FC, useContext } from 'react'
 import { Link, useLocation } from 'react-router-dom'
 
-import { IconOutline, PlatformRoute, routeContext, RouteContextData } from '../../../../lib'
+import { IconOutline, PlatformRoute, routeContext, RouteContextData, routeIsActiveTool } from '../../../../lib'
 
 import styles from './ToolSelectorNarrow.module.scss'
 
@@ -16,13 +16,12 @@ const ToolSelectorNarrow: FC<ToolSelectorNarrowProps> = (props: ToolSelectorNarr
 
     const {
         getPathFromRoute,
-        isActiveTool,
     }: RouteContextData = useContext(routeContext)
 
     const toolRoute: PlatformRoute = props.route
     const toolPath: string = getPathFromRoute(toolRoute)
     const baseClass: string = 'tool-selector-narrow'
-    const isActive: boolean = isActiveTool(useLocation().pathname, toolRoute)
+    const isActive: boolean = routeIsActiveTool(useLocation().pathname, toolRoute)
     const activeIndicaterClass: string = `${baseClass}-${isActive ? '' : 'in'}active`
     const hasChildren: boolean = !!toolRoute.children?.some(child => !!child.route && !isParamRoute(child.route))
 

src-ts/header/tool-selectors/tool-selectors-wide/tool-selector-wide/ToolSelectorWide.tsx

@@ -6,6 +6,7 @@ import {
     PlatformRoute,
     routeContext,
     RouteContextData,
+    routeIsActiveTool,
 } from '../../../../lib'
 import '../../../../lib/styles/index.scss'
 
@@ -19,15 +20,14 @@ const ToolSelectorWide: FC<ToolSelectorWideProps> = (props: ToolSelectorWideProp
 
     const {
         getPathFromRoute,
-        isActiveTool,
         isRootRoute,
     }: RouteContextData = useContext(routeContext)
 
     const activePath: string = useLocation().pathname
     const toolRoute: PlatformRoute = props.route
     const toolPath: string = getPathFromRoute(toolRoute)
     const baseClass: string = 'tool-selector-wide'
-    const isActive: boolean = isActiveTool(activePath, toolRoute)
+    const isActive: boolean = routeIsActiveTool(activePath, toolRoute)
     const activeIndicatorClass: string = `${baseClass}-${isActive ? '' : 'in'}active`
 
     // the tool link should be usable for all active routes except the home page

src-ts/header/utility-selectors/UtilitySelector/ProfileSelector/profile-not-logged-in/ProfileNotLoggedIn.module.scss

@@ -1,29 +1,40 @@
-import { FC } from 'react'
+import { FC, useContext } from 'react'
+import { Location, useLocation } from 'react-router-dom'
 
-import { authUrlLogin, authUrlSignup, Button } from '../../../../../lib'
+import {
+    authUrlLogin,
+    Button,
+    routeContext,
+    RouteContextData,
+} from '../../../../../lib'
 import '../../../../../lib/styles/index.scss'
 
-import styles from './ProfileNotLoggedIn.module.scss'
-
 const ProfileNotLoggedIn: FC<{}> = () => {
 
+    const routeData: RouteContextData = useContext(routeContext)
+    const location: Location = useLocation()
+
+    function signUp(): void {
+        const signupUrl: string = routeData.getSignupUrl(location.pathname, routeData.toolsRoutes)
+        window.location.href = signupUrl
+    }
+
     return (
         <>
             <Button
                 buttonStyle='text'
-                className={styles.login}
+                className='mobile-hide'
                 label='Log In'
                 size='md'
                 tabIndex={-1}
-                url={authUrlLogin}
+                url={authUrlLogin()}
             />
             <Button
                 buttonStyle='tertiary'
-                className={styles.signup}
                 label='Sign Up'
                 size='md'
                 tabIndex={-1}
-                url={authUrlSignup}
+                onClick={signUp}
             />
         </>
     )

src-ts/header/utility-selectors/UtilitySelector/ProfileSelector/profile-not-logged-in/ProfileNotLoggedIn.tsx

@@ -0,0 +1,3 @@
+export enum AuthenticationRegistrationSource {
+    work = 'selfService',
+}

src-ts/lib/functions/authentication-functions/authentication-reg-source.enum.ts

@@ -1,9 +1,16 @@
 import { EnvironmentConfig } from '../../../config'
 
+import { AuthenticationRegistrationSource } from './authentication-reg-source.enum'
+
 export const authentication: string = EnvironmentConfig.URL.ACCOUNTS_APP_CONNECTOR
 
-export const login: string = `${authentication}?retUrl=${encodeURIComponent(window.location.href.match(/[^?]*/)?.[0] || window.location.host)}`
+export function login(returnUrl?: string): string {
+    const retUrl: string = returnUrl ?? window.location.href.match(/[^?]*/)?.[0] ?? window.location.host
+    return `${authentication}?retUrl=${encodeURIComponent(retUrl)}`
+}
 
 export const logout: string = `${authentication}?logout=true&retUrl=${encodeURIComponent('https://' + window.location.host)}`
 
-export const signup: string = `${login}&regSource=tcBusiness&mode=signUp`
+export function signup(returnUrl?: string, regSource?: AuthenticationRegistrationSource): string {
+    return `${login(returnUrl)}&mode=signUp${!!regSource ? `&regSource=${regSource}` : ''}`
+}

src-ts/lib/functions/authentication-functions/authentication-url.config.ts

@@ -2,9 +2,11 @@ import cookies from 'browser-cookies'
 import { configureConnector, decodeToken, getFreshToken } from 'tc-auth-lib'
 
 import { User } from '../../../../types/tc-auth-lib'
-import { EnvironmentConfig } from '../../../config'
+import { EnvironmentConfig, ToolTitle } from '../../../config'
+import { PlatformRoute } from '../../route-provider'
 import { logError } from '../logging-functions'
 
+import { AuthenticationRegistrationSource } from './authentication-reg-source.enum'
 import { authentication as authenticationUrl } from './authentication-url.config'
 import { CookieKeys } from './cookie-keys.enum'
 
@@ -20,6 +22,21 @@ configureConnector({
     mockToken: undefined,
 })
 
+export function getRegistrationSource(activeTool: PlatformRoute | undefined): AuthenticationRegistrationSource | undefined {
+
+    switch (activeTool?.title) {
+
+        // currently, there is no reg source for members
+        case ToolTitle.learn:
+            return
+
+        // currently, the work tool and the platform
+        // landing page use the reg source of selfService
+        default:
+            return AuthenticationRegistrationSource.work
+    }
+}
+
 export async function initializeAsync(): Promise<string | undefined> {
     return getFreshToken()
         .then((tokenV3: string) => {

src-ts/lib/functions/authentication-functions/authentication.functions.ts

@@ -1,7 +1,11 @@
+export * from './authentication-reg-source.enum'
 export {
     authentication as authUrl,
     login as authUrlLogin,
     logout as authUrlLogout,
     signup as authUrlSignup,
 } from './authentication-url.config'
-export { initializeAsync as authInitializeAsync } from './authentication.functions'
+export {
+    getRegistrationSource as authGetRegistrationSource,
+    initializeAsync as authInitializeAsync,
+} from './authentication.functions'