Bump package to and dependecies to alpha20

packages/app/.gitignore

@@ -1 +0,0 @@
-build/

packages/app/package.json

@@ -1,30 +1,35 @@
 {
   "name": "example-app",
-  "version": "0.1.1-alpha.16",
+  "version": "0.1.1-alpha.20",
   "private": true,
   "dependencies": {
-    "@backstage/cli": "^0.1.1-alpha.16",
-    "@backstage/core": "^0.1.1-alpha.16",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.16",
-    "@backstage/plugin-circleci": "^0.1.1-alpha.16",
-    "@backstage/plugin-explore": "^0.1.1-alpha.16",
-    "@backstage/plugin-gcp-projects": "^0.1.1-alpha.16",
-    "@backstage/plugin-github-actions": "^0.1.1-alpha.16",
-    "@backstage/plugin-gitops-profiles": "^0.1.1-alpha.16",
-    "@backstage/plugin-graphiql": "^0.1.1-alpha.16",
-    "@backstage/plugin-lighthouse": "^0.1.1-alpha.16",
-    "@backstage/plugin-register-component": "^0.1.1-alpha.16",
-    "@backstage/plugin-rollbar": "^0.1.1-alpha.16",
-    "@backstage/plugin-scaffolder": "^0.1.1-alpha.16",
-    "@backstage/plugin-sentry": "^0.1.1-alpha.16",
-    "@backstage/plugin-tech-radar": "^0.1.1-alpha.16",
-    "@backstage/plugin-techdocs": "^0.1.1-alpha.16",
-    "@backstage/plugin-welcome": "^0.1.1-alpha.16",
-    "@backstage/test-utils": "^0.1.1-alpha.16",
-    "@backstage/theme": "^0.1.1-alpha.16",
+    "@backstage/cli": "^0.1.1-alpha.20",
+    "@backstage/core": "^0.1.1-alpha.20",
+    "@backstage/plugin-api-docs": "^0.1.1-alpha.20",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.20",
+    "@backstage/plugin-circleci": "^0.1.1-alpha.20",
+    "@backstage/plugin-explore": "^0.1.1-alpha.20",
+    "@backstage/plugin-gcp-projects": "^0.1.1-alpha.20",
+    "@backstage/plugin-github-actions": "^0.1.1-alpha.20",
+    "@backstage/plugin-gitops-profiles": "^0.1.1-alpha.20",
+    "@backstage/plugin-graphiql": "^0.1.1-alpha.20",
+    "@backstage/plugin-jenkins": "^0.1.1-alpha.20",
+    "@backstage/plugin-lighthouse": "^0.1.1-alpha.20",
+    "@backstage/plugin-newrelic": "^0.1.1-alpha.20",
+    "@backstage/plugin-register-component": "^0.1.1-alpha.20",
+    "@backstage/plugin-rollbar": "^0.1.1-alpha.20",
+    "@backstage/plugin-scaffolder": "^0.1.1-alpha.20",
+    "@backstage/plugin-sentry": "^0.1.1-alpha.20",
+    "@backstage/plugin-tech-radar": "^0.1.1-alpha.20",
+    "@backstage/plugin-techdocs": "^0.1.1-alpha.20",
+    "@backstage/plugin-welcome": "^0.1.1-alpha.20",
+    "@backstage/test-utils": "^0.1.1-alpha.20",
+    "@backstage/theme": "^0.1.1-alpha.20",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@octokit/rest": "^18.0.0",
+    "@roadiehq/backstage-plugin-github-pull-requests": "0.3.0",
+    "@roadiehq/backstage-plugin-travis-ci": "^0.1.4",
     "history": "^5.0.0",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
@@ -32,7 +37,7 @@
     "react-hot-loader": "^4.12.21",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
-    "react-use": "^14.2.0",
+    "react-use": "^15.3.3",
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {

packages/app/src/App.test.tsx

@@ -27,6 +27,9 @@ describe('App', () => {
           data: {
             app: { title: 'Test' },
             backend: { baseUrl: 'http://localhost:7000' },
+            techdocs: {
+              storageUrl: 'http://localhost:7000/techdocs/static/docs',
+            },
           },
           context: 'test',
         },

packages/app/src/App.tsx

@@ -19,25 +19,27 @@ import {
   AlertDisplay,
   OAuthRequestDialog,
   SignInPage,
-  useApi,
-  configApiRef,
 } from '@backstage/core';
 import React, { FC } from 'react';
 import Root from './components/Root';
 import * as plugins from './plugins';
 import { apis } from './apis';
 import { hot } from 'react-hot-loader/root';
+import { providers } from './identityProviders';
 
 const app = createApp({
   apis,
   plugins: Object.values(plugins),
   components: {
     SignInPage: props => {
-      const configApi = useApi(configApiRef);
-      const providersConfig = configApi.getOptionalConfig('auth.providers');
-      const providers = providersConfig?.keys() ?? [];
-
-      return <SignInPage {...props} providers={['guest', ...providers]} />;
+      return (
+        <SignInPage
+          {...props}
+          providers={['guest', 'custom', ...providers]}
+          title="Select a sign-in method"
+          align="center"
+        />
+      );
     },
   },
 });

packages/app/src/apis.ts

@@ -24,11 +24,15 @@ import {
   ErrorAlerter,
   featureFlagsApiRef,
   FeatureFlags,
+  discoveryApiRef,
+  UrlPatternDiscovery,
   GoogleAuth,
   GithubAuth,
   OAuth2,
   OktaAuth,
   GitlabAuth,
+  Auth0Auth,
+  MicrosoftAuth,
   oauthRequestApiRef,
   OAuthRequestManager,
   googleAuthApiRef,
@@ -36,6 +40,8 @@ import {
   oauth2ApiRef,
   oktaAuthApiRef,
   gitlabAuthApiRef,
+  auth0AuthApiRef,
+  microsoftAuthApiRef,
   storageApiRef,
   WebStorage,
 } from '@backstage/core';
@@ -56,6 +62,10 @@ import {
   GraphQLEndpoints,
 } from '@backstage/plugin-graphiql';
 import { scaffolderApiRef, ScaffolderApi } from '@backstage/plugin-scaffolder';
+import {
+  techdocsStorageApiRef,
+  TechDocsStorageApi,
+} from '@backstage/plugin-techdocs';
 
 import { rollbarApiRef, RollbarClient } from '@backstage/plugin-rollbar';
 import { GCPClient, GCPApiRef } from '@backstage/plugin-gcp-projects';
@@ -63,6 +73,16 @@ import {
   GithubActionsClient,
   githubActionsApiRef,
 } from '@backstage/plugin-github-actions';
+import { jenkinsApiRef, JenkinsApi } from '@backstage/plugin-jenkins';
+
+import {
+  TravisCIApi,
+  travisCIApiRef,
+} from '@roadiehq/backstage-plugin-travis-ci';
+import {
+  GithubPullRequestsClient,
+  githubPullRequestsApiRef,
+} from '@roadiehq/backstage-plugin-github-pull-requests';
 
 
 export const apis = (config: ConfigApi) => {
@@ -70,9 +90,14 @@ export const apis = (config: ConfigApi) => {
   console.log(`Creating APIs for ${config.getString('app.title')}`);
 
   const backendUrl = config.getString('backend.baseUrl');
+  const techdocsUrl = config.getString('techdocs.storageUrl');
 
   const builder = ApiRegistry.builder();
 
+  const discoveryApi = builder.add(
+    discoveryApiRef,
+    UrlPatternDiscovery.compile(`${backendUrl}/{{ pluginId }}`),
+  );
   const alertApi = builder.add(alertApiRef, new AlertApiForwarder());
   const errorApi = builder.add(
     errorApiRef,
@@ -87,12 +112,17 @@ export const apis = (config: ConfigApi) => {
     new CircleCIApi(`${backendUrl}/proxy/circleci/api`),
   );
 
+  builder.add(jenkinsApiRef, new JenkinsApi(`${backendUrl}/proxy/jenkins/api`));
+
   builder.add(githubActionsApiRef, new GithubActionsClient());
 
   builder.add(featureFlagsApiRef, new FeatureFlags());
 
   builder.add(lighthouseApiRef, new LighthouseRestApi('http://localhost:3003'));
 
+  builder.add(travisCIApiRef, new TravisCIApi());
+  builder.add(githubPullRequestsApiRef, new GithubPullRequestsClient());
+
   const oauthRequestApi = builder.add(
     oauthRequestApiRef,
     new OAuthRequestManager(),
@@ -101,8 +131,15 @@ export const apis = (config: ConfigApi) => {
   builder.add(
     googleAuthApiRef,
     GoogleAuth.create({
-      apiOrigin: backendUrl,
-      basePath: '/auth/',
+      discoveryApi,
+      oauthRequestApi,
+    }),
+  );
+
+  builder.add(
+    microsoftAuthApiRef,
+    MicrosoftAuth.create({
+      discoveryApi,
       oauthRequestApi,
     }),
   );
@@ -110,8 +147,7 @@ export const apis = (config: ConfigApi) => {
   const githubAuthApi = builder.add(
     githubAuthApiRef,
     GithubAuth.create({
-      apiOrigin: backendUrl,
-      basePath: '/auth/',
+      discoveryApi,
       oauthRequestApi,
     }),
   );
@@ -119,8 +155,7 @@ export const apis = (config: ConfigApi) => {
   builder.add(
     oktaAuthApiRef,
     OktaAuth.create({
-      apiOrigin: backendUrl,
-      basePath: '/auth/',
+      discoveryApi,
       oauthRequestApi,
     }),
   );
@@ -128,8 +163,15 @@ export const apis = (config: ConfigApi) => {
   builder.add(
     gitlabAuthApiRef,
     GitlabAuth.create({
-      apiOrigin: backendUrl,
-      basePath: '/auth/',
+      discoveryApi,
+      oauthRequestApi,
+    }),
+  );
+
+  builder.add(
+    auth0AuthApiRef,
+    Auth0Auth.create({
+      discoveryApi,
       oauthRequestApi,
     }),
   );
@@ -137,8 +179,7 @@ export const apis = (config: ConfigApi) => {
   builder.add(
     oauth2ApiRef,
     OAuth2.create({
-      apiOrigin: backendUrl,
-      basePath: '/auth/',
+      discoveryApi,
       oauthRequestApi,
     }),
   );
@@ -151,21 +192,9 @@ export const apis = (config: ConfigApi) => {
     }),
   );
 
-  builder.add(
-    catalogApiRef,
-    new CatalogClient({
-      apiOrigin: backendUrl,
-      basePath: '/catalog',
-    }),
-  );
+  builder.add(catalogApiRef, new CatalogClient({ discoveryApi }));
 
-  builder.add(
-    scaffolderApiRef,
-    new ScaffolderApi({
-      apiOrigin: backendUrl,
-      basePath: '/scaffolder/v1',
-    }),
-  );
+  builder.add(scaffolderApiRef, new ScaffolderApi({ discoveryApi }));
 
   builder.add(gitOpsApiRef, new GitOpsRestApi('http://localhost:3008'));
 
@@ -186,11 +215,12 @@ export const apis = (config: ConfigApi) => {
     ]),
   );
 
+  builder.add(rollbarApiRef, new RollbarClient({ discoveryApi }));
+
   builder.add(
-    rollbarApiRef,
-    new RollbarClient({
-      apiOrigin: backendUrl,
-      basePath: '/rollbar',
+    techdocsStorageApiRef,
+    new TechDocsStorageApi({
+      apiOrigin: techdocsUrl,
     }),
   );
 

packages/app/src/components/Root/Root.tsx

@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 import { Link, makeStyles } from '@material-ui/core';
 import HomeIcon from '@material-ui/icons/Home';
 import ExploreIcon from '@material-ui/icons/Explore';
+import ExtensionIcon from '@material-ui/icons/Extension';
 import BuildIcon from '@material-ui/icons/BuildRounded';
 import RuleIcon from '@material-ui/icons/AssignmentTurnedIn';
 import MapIcon from '@material-ui/icons/MyLocation';
@@ -38,6 +39,7 @@ import {
   SidebarUserSettings,
   SidebarThemeToggle,
   SidebarPinButton,
+  DefaultProviderSettings,
 } from '@backstage/core';
 import { NavLink } from 'react-router-dom';
 import { graphiQLRouteRef } from '@backstage/plugin-graphiql';
@@ -90,6 +92,7 @@ const Root: FC<{}> = ({ children }) => (
       {/* Global nav, not org-specific */}
       <SidebarItem icon={HomeIcon} to="./" text="Home" />
       <SidebarItem icon={ExploreIcon} to="explore" text="Explore" />
+      <SidebarItem icon={ExtensionIcon} to="api-docs" text="APIs" />
       <SidebarItem icon={LibraryBooks} to="docs" text="Docs" />
       <SidebarItem icon={CreateComponentIcon} to="create" text="Create..." />
       {/* End global nav */}
@@ -105,7 +108,7 @@ const Root: FC<{}> = ({ children }) => (
       <SidebarSpace />
       <SidebarDivider />
       <SidebarThemeToggle />
-      <SidebarUserSettings />
+      <SidebarUserSettings providerSettings={<DefaultProviderSettings />} />
       <SidebarPinButton />
     </Sidebar>
     {children}

packages/app/src/identityProviders.ts

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  googleAuthApiRef,
+  gitlabAuthApiRef,
+  oktaAuthApiRef,
+  githubAuthApiRef,
+  microsoftAuthApiRef,
+} from '@backstage/core';
+
+export const providers = [
+  {
+    id: 'google-auth-provider',
+    title: 'Google',
+    message: 'Sign In using Google',
+    apiRef: googleAuthApiRef,
+  },
+  {
+    id: 'microsoft-auth-provider',
+    title: 'Microsoft',
+    message: 'Sign In using Microsoft Azure AD',
+    apiRef: microsoftAuthApiRef,
+  },
+  {
+    id: 'gitlab-auth-provider',
+    title: 'GitLab',
+    message: 'Sign In using GitLab',
+    apiRef: gitlabAuthApiRef,
+  },
+  {
+    id: 'github-auth-provider',
+    title: 'GitHub',
+    message: 'Sign In using GitHub',
+    apiRef: githubAuthApiRef,
+  },
+  {
+    id: 'okta-auth-provider',
+    title: 'Okta',
+    message: 'Sign In using Okta',
+    apiRef: oktaAuthApiRef,
+  },
+];

packages/app/src/plugins.ts

@@ -27,4 +27,9 @@ export { plugin as TechDocs } from '@backstage/plugin-techdocs';
 export { plugin as GraphiQL } from '@backstage/plugin-graphiql';
 export { plugin as GithubActions } from '@backstage/plugin-github-actions';
 export { plugin as Rollbar } from '@backstage/plugin-rollbar';
+export { plugin as Newrelic } from '@backstage/plugin-newrelic';
+export { plugin as TravisCI } from '@roadiehq/backstage-plugin-travis-ci';
+export { plugin as Jenkins } from '@backstage/plugin-jenkins';
+export { plugin as ApiDocs } from '@backstage/plugin-api-docs';
+export { plugin as GithubPullRequests } from '@roadiehq/backstage-plugin-github-pull-requests';
 export { plugin as GcpProjects } from '@backstage/plugin-gcp-projects';