Merge pull request #3561 from amvanbaren/v0.23.0-rc.1

Test v0.23.0-rc.1

Author: amvanbaren

Dockerfile

@@ -1,4 +1,4 @@
-ARG SERVER_VERSION=13234236
+ARG SERVER_VERSION=v0.23.0-rc.1
 
 # Builder image to compile the website
 FROM ubuntu AS builder
@@ -19,7 +19,7 @@ RUN apt-get update \
   && corepack prepare yarn@stable --activate
 
 # bump to update website
-ENV WEBSITE_VERSION 0.15.0
+ENV WEBSITE_VERSION 0.16.0-next.9ad64f0d
 COPY . /workdir
 
 RUN /usr/bin/yarn --cwd website \

website/package.json

@@ -6,7 +6,7 @@
     "repository": "https://github.com/eclipse/open-vsx.org",
     "license": "EPL-2.0",
     "dependencies": {
-        "openvsx-webui": "0.15.0"
+        "openvsx-webui": "0.16.0-next.9ad64f0d"
     },
     "peerDependencies": {
         "@babel/core": "^7.0.0"

website/src/main.tsx

@@ -16,6 +16,7 @@ import { ThemeProvider } from '@mui/material/styles';
 import { useMediaQuery } from '@mui/material';
 import { Main, ExtensionRegistryService } from 'openvsx-webui';
 import createDefaultTheme from 'openvsx-webui/lib/default/theme';
+import {createAbsoluteURL} from 'openvsx-webui/lib/utils';
 import createPageSettings from './page-settings';
 
 const App: FunctionComponent = () => {
@@ -42,7 +43,7 @@ const App: FunctionComponent = () => {
                 <Main
                     service={service}
                     pageSettings={pageSettings}
-                    canLogin
+                    loginProviders={{github: createAbsoluteURL(['oauth2', 'authorization', 'github'])}}
                 />
             </ThemeProvider>
         </HelmetProvider>

website/src/menu-content.tsx

@@ -26,37 +26,43 @@ import AccountBoxIcon from '@mui/icons-material/AccountBox';
 import { UserSettingsRoutes } from 'openvsx-webui';
 import { MainContext } from 'openvsx-webui/lib/context';
 import { MobileMenuItem, itemIcon, MobileMenuItemText, MobileUserAvatar, headerItem, MenuLink, MenuRouteLink } from 'openvsx-webui/lib/default/menu-content'
+import { LoginComponent } from 'openvsx-webui/lib/default/login'
 import { UserAvatar } from 'openvsx-webui/lib/pages/user/avatar';
 
 //-------------------- Mobile View --------------------//
 
 export const MobileMenuContent: FunctionComponent = () => {
-    const {service, user} = useContext(MainContext)
+    const {user, loginProviders} = useContext(MainContext)
     return <>
-        {
-            user
-                ? <MobileUserAvatar/>
-                : <MobileMenuItem>
-                    <Link href={service.getLoginUrl()}>
-                        <MobileMenuItemText>
-                            <AccountBoxIcon sx={itemIcon} />
-                            Log In
-                        </MobileMenuItemText>
-                    </Link>
+        {loginProviders && (
+            user ? (
+                <MobileUserAvatar />
+            ) : (
+                <MobileMenuItem>
+                    <LoginComponent
+                        loginProviders={loginProviders}
+                        renderButton={(href, onClick) => {
+                            return (<Link href={href} onClick={onClick}>
+                                <MobileMenuItemText>
+                                    <AccountBoxIcon sx={itemIcon} />
+                                    Log In
+                                </MobileMenuItemText>
+                            </Link>);
+                        }}
+                    />
                 </MobileMenuItem>
-        }
-        {
-            !location.pathname.startsWith(UserSettingsRoutes.ROOT)
-            ? <MobileMenuItem>
+            )
+        )}
+        {loginProviders && !location.pathname.startsWith(UserSettingsRoutes.ROOT) && (
+            <MobileMenuItem>
                 <RouteLink to='/user-settings/extensions'>
                     <MobileMenuItemText>
                         <PublishIcon sx={itemIcon} />
                         Publish Extension
                     </MobileMenuItemText>
                 </RouteLink>
             </MobileMenuItem>
-            : null
-        }
+        )}
         <MobileMenuItem>
             <Link target='_blank' href='https://github.com/eclipse/openvsx'>
                 <MobileMenuItemText>
@@ -156,7 +162,7 @@ const SubMenuLink = styled(Link)(subMenuLink);
 
 
 export const DefaultMenuContent: FunctionComponent = () => {
-    const {service, user} = useContext(MainContext)
+    const {loginProviders, user} = useContext(MainContext)
     const [workingGroupMenuOpen, setWorkingGroupMenuOpen] = useState(false);
     const workingGroupMenuEl = useRef<HTMLButtonElement | null>(null);
     const toggleWorkingGroupMenu = () => setWorkingGroupMenuOpen(!workingGroupMenuOpen);
@@ -191,16 +197,37 @@ export const DefaultMenuContent: FunctionComponent = () => {
         <Button variant='contained' color='secondary' href='/user-settings/extensions' sx={{ mx: 2.5 }}>
             Publish
         </Button>
-        {
-            user ?
-                <UserAvatar />
-                :
-                <IconButton
-                    href={service.getLoginUrl()}
-                    title='Log In'
-                    aria-label='Log In' >
-                    <AccountBoxIcon />
-                </IconButton>
-        }
+        {loginProviders && (
+            <>
+                <Button variant='contained' color='secondary' href='/user-settings/extensions' sx={{ mx: 2.5 }}>
+                    Publish
+                </Button>
+                {
+                    user ?
+                        <UserAvatar />
+                        :
+                        <LoginComponent
+                            loginProviders={loginProviders}
+                            renderButton={(href, onClick) => {
+                                if (href) {
+                                    return (<IconButton
+                                        href={href}
+                                        title='Log In'
+                                        aria-label='Log In' >
+                                        <AccountBoxIcon />
+                                    </IconButton>);
+                                } else {
+                                    return (<IconButton
+                                        onClick={onClick}
+                                        title='Log In'
+                                        aria-label='Log In' >
+                                        <AccountBoxIcon />
+                                    </IconButton>);
+                                }
+                            }}
+                        />
+                }
+            </>
+        )}
     </>;
 }

website/yarn.lock

@@ -2411,7 +2411,7 @@ __metadata:
     "@types/react-router-dom": "npm:^5.3.3"
     css-loader: "npm:^6.8.1"
     express: "npm:^4.21.2"
-    openvsx-webui: "npm:0.15.0"
+    openvsx-webui: "npm:0.16.0-next.9ad64f0d"
     source-map-loader: "npm:^4.0.1"
     style-loader: "npm:^3.3.3"
     typescript: "npm:~5.1.6"
@@ -2432,9 +2432,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"openvsx-webui@npm:0.15.0":
-  version: 0.15.0
-  resolution: "openvsx-webui@npm:0.15.0"
+"openvsx-webui@npm:0.16.0-next.9ad64f0d":
+  version: 0.16.0-next.9ad64f0d
+  resolution: "openvsx-webui@npm:0.16.0-next.9ad64f0d"
   dependencies:
     "@emotion/react": "npm:^11.11.1"
     "@emotion/styled": "npm:^11.11.0"
@@ -2460,7 +2460,7 @@ __metadata:
     react-router-dom: "npm:^6.14.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/c3cff9e5cf7043e889d82b6e3421237b9e9ea65773e0559eb5167713d67d47da5196eb9d726105a851171a9a811d91f5070b75cd25142ad07f7aea38c5e23996
+  checksum: 10/04e0b2c457790daca609a0c36d67a7ecb22b6a7078e8a54884c30da925b9f8496f1ed6b1ab260d9c4df98cc565f54dcfd2e274f4f803737680e0571f710c92da
   languageName: node
   linkType: hard