chore: 🔧 sso and login help

apotdevin · Aug 5, 2020 · 2de92be · 2de92be
1 parent 82c052d
commit 2de92be
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 26 deletions.
diff --git a/server/schema/auth/resolvers.ts b/server/schema/auth/resolvers.ts
@@ -17,27 +17,31 @@ const { cookiePath, nodeEnv } = serverRuntimeConfig || {};
 
 export const authResolvers = {
   Query: {
-    getAuthToken: async (_: undefined, params: any, context: ContextType) => {
+    getAuthToken: async (
+      _: undefined,
+      params: any,
+      context: ContextType
+    ): Promise<boolean> => {
       const { ip, secret, sso, res } = context;
       await requestLimiter(ip, 'getAuthToken');
 
       if (!sso) {
         logger.warn('No SSO account available');
-        return null;
+        return false;
       }
 
       if (!sso.socket || !sso.macaroon) {
         logger.warn('Host and macaroon are required for SSO');
-        return null;
+        return false;
       }
 
       if (!params.cookie) {
-        return null;
+        return false;
       }
 
       if (cookiePath === '') {
         logger.warn('SSO auth not available since no cookie path was provided');
-        return null;
+        return false;
       }
 
       const cookieFile = readCookie(cookiePath);
@@ -61,7 +65,7 @@ export const authResolvers = {
       }
 
       logger.debug(`Cookie ${params.cookie} different to file ${cookieFile}`);
-      return null;
+      return false;
     },
     getSessionToken: async (
       _: undefined,

diff --git a/server/schema/types.ts b/server/schema/types.ts
@@ -79,7 +79,7 @@ export const queryTypes = gql`
       initialize: Boolean
       lastMessage: String
     ): getMessagesType
-    getAuthToken(cookie: String): Boolean
+    getAuthToken(cookie: String): Boolean!
     getSessionToken(id: String, password: String): Boolean
     getServerAccounts: [serverAccountType]
     getAccount: serverAccountType

diff --git a/src/components/accounts/ServerAccounts.tsx b/src/components/accounts/ServerAccounts.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { useRouter } from 'next/router';
 import { getUrlParam } from 'src/utils/url';
 import { useGetAuthTokenQuery } from 'src/graphql/queries/__generated__/getAuthToken.generated';
+import { toast } from 'react-toastify';
 
 export const ServerAccounts: React.FC = () => {
   const { push, query } = useRouter();
@@ -15,9 +16,13 @@ export const ServerAccounts: React.FC = () => {
   });
 
   React.useEffect(() => {
-    if (cookieParam && authData && authData.getAuthToken) {
+    if (!cookieParam || !authData) return;
+    if (authData.getAuthToken) {
       push('/');
     }
+    if (!authData.getAuthToken) {
+      toast.warning('Unable to SSO. Check your logs.');
+    }
   }, [push, authData, cookieParam]);
 
   return null;

diff --git a/src/graphql/types.ts b/src/graphql/types.ts
@@ -75,7 +75,7 @@ export type Query = {
   getChainTransactions?: Maybe<Array<Maybe<GetTransactionsType>>>;
   getUtxos?: Maybe<Array<Maybe<GetUtxosType>>>;
   getMessages?: Maybe<GetMessagesType>;
-  getAuthToken?: Maybe<Scalars['Boolean']>;
+  getAuthToken: Scalars['Boolean'];
   getSessionToken?: Maybe<Scalars['Boolean']>;
   getServerAccounts?: Maybe<Array<Maybe<ServerAccountType>>>;
   getAccount?: Maybe<ServerAccountType>;

diff --git a/src/views/homepage/Accounts.tsx b/src/views/homepage/Accounts.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import styled from 'styled-components';
 import { toast } from 'react-toastify';
-import { Lock, Unlock } from 'react-feather';
+import { Lock, Unlock, ChevronDown, ChevronUp } from 'react-feather';
 import { chartColors } from 'src/styles/Themes';
 import { useRouter } from 'next/router';
 import { useGetCanConnectLazyQuery } from 'src/graphql/queries/__generated__/getNodeInfo.generated';
@@ -10,7 +10,13 @@ import { useGetServerAccountsQuery } from 'src/graphql/queries/__generated__/get
 import { ServerAccountType } from 'src/graphql/types';
 import { LoadingCard } from 'src/components/loading/LoadingCard';
 import { Section } from '../../components/section/Section';
-import { Card, SingleLine } from '../../components/generic/Styled';
+import {
+  Card,
+  SingleLine,
+  DarkSubTitle,
+  Sub4Title,
+  Separation,
+} from '../../components/generic/Styled';
 import { ColorButton } from '../../components/buttons/colorButton/ColorButton';
 import { ConnectTitle, LockPadding } from './HomePage.styled';
 import { Login } from './Login';
@@ -19,20 +25,51 @@ const AccountLine = styled.div`
   margin: 8px 0;
 `;
 
-const renderIntro = () => (
-  <Section color={'transparent'}>
-    <ConnectTitle changeColor={true}>Hi! Welcome to ThunderHub</ConnectTitle>
-    <Card>
-      {'To start you must create an account on your server. '}
-      <Link
-        newTab={true}
-        href={'https://github.com/apotdevin/thunderhub#server-accounts'}
-      >
-        You can find instructions for this here.
-      </Link>
-    </Card>
-  </Section>
-);
+const DetailsLine = styled.div`
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-between;
+  cursor: pointer;
+`;
+
+const RenderIntro = () => {
+  const [detailsOpen, setDetailsOpen] = React.useState(false);
+  return (
+    <Section color={'transparent'}>
+      <ConnectTitle changeColor={true}>Hi! Welcome to ThunderHub</ConnectTitle>
+      <Card>
+        {'To start you must create an account on your server. '}
+        <Link
+          newTab={true}
+          href={'https://github.com/apotdevin/thunderhub#server-accounts'}
+        >
+          You can find instructions for this here.
+        </Link>
+      </Card>
+      <Card>
+        <DetailsLine onClick={() => setDetailsOpen(p => !p)}>
+          <DarkSubTitle>{'Did you already create accounts?'}</DarkSubTitle>
+          {detailsOpen ? <ChevronUp size={16} /> : <ChevronDown size={16} />}
+        </DetailsLine>
+        {detailsOpen && (
+          <>
+            <Separation />
+            <Sub4Title>
+              The accounts might be missing information that is needed for them
+              to be available. Please check your logs to see if there is
+              anything missing.
+            </Sub4Title>
+            <Sub4Title>
+              On server start you will see a log message of the accounts that
+              will be available.
+            </Sub4Title>
+          </>
+        )}
+      </Card>
+    </Section>
+  );
+};
 
 export const Accounts = () => {
   const { push } = useRouter();
@@ -67,7 +104,7 @@ export const Accounts = () => {
   }
 
   if (!accountData?.getServerAccounts?.length) {
-    return renderIntro();
+    return <RenderIntro />;
   }
 
   const getTitle = (account: ServerAccountType) => {