Refactor: AssignDomainDialog using Modal component

Add missing rpid env var

packages/backend/package.json

@@ -19,6 +19,7 @@
     "cors": "^2.8.5",
     "debug": "^4.3.1",
     "express": "^4.18.2",
+    "express-async-errors": "^3.1.1",
     "express-session": "^1.18.0",
     "fs-extra": "^11.2.0",
     "graphql": "^16.8.1",

packages/backend/src/index.ts

@@ -1,3 +1,4 @@
+import 'express-async-errors';
 import 'reflect-metadata';
 import debug from 'debug';
 import fs from 'fs';

packages/backend/src/resolvers.ts

@@ -17,7 +17,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         return context.user;
       },
 
-      organizations: async (_:any, __: any, context: any) => {
+      organizations: async (_: any, __: any, context: any) => {
         return service.getOrganizationsByUserId(context.user);
       },
 
@@ -25,8 +25,15 @@ export const createResolvers = async (service: Service): Promise<any> => {
         return service.getProjectById(projectId);
       },
 
-      projectsInOrganization: async (_: any, { organizationSlug }: {organizationSlug: string }, context: any) => {
-        return service.getProjectsInOrganization(context.user, organizationSlug);
+      projectsInOrganization: async (
+        _: any,
+        { organizationSlug }: { organizationSlug: string },
+        context: any,
+      ) => {
+        return service.getProjectsInOrganization(
+          context.user,
+          organizationSlug,
+        );
       },
 
       deployments: async (_: any, { projectId }: { projectId: string }) => {
@@ -35,7 +42,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       environmentVariables: async (
         _: any,
-        { projectId }: { projectId: string }
+        { projectId }: { projectId: string },
       ) => {
         return service.getEnvironmentVariablesByProjectId(projectId);
       },
@@ -44,7 +51,11 @@ export const createResolvers = async (service: Service): Promise<any> => {
         return service.getProjectMembersByProjectId(projectId);
       },
 
-      searchProjects: async (_: any, { searchText }: { searchText: string }, context: any) => {
+      searchProjects: async (
+        _: any,
+        { searchText }: { searchText: string },
+        context: any,
+      ) => {
         return service.searchProjects(context.user, searchText);
       },
 
@@ -52,11 +63,11 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           projectId,
-          filter
-        }: { projectId: string; filter?: FindOptionsWhere<Domain> }
+          filter,
+        }: { projectId: string; filter?: FindOptionsWhere<Domain> },
       ) => {
         return service.getDomainsByProjectId(projectId, filter);
-      }
+      },
     },
 
     // TODO: Return error in GQL response
@@ -64,10 +75,13 @@ export const createResolvers = async (service: Service): Promise<any> => {
       removeProjectMember: async (
         _: any,
         { projectMemberId }: { projectMemberId: string },
-        context: any
+        context: any,
       ) => {
         try {
-          return await service.removeProjectMember(context.user, projectMemberId);
+          return await service.removeProjectMember(
+            context.user,
+            projectMemberId,
+          );
         } catch (err) {
           log(err);
           return false;
@@ -78,13 +92,13 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           projectMemberId,
-          data
+          data,
         }: {
           projectMemberId: string;
           data: {
             permissions: Permission[];
           };
-        }
+        },
       ) => {
         try {
           return await service.updateProjectMember(projectMemberId, data);
@@ -98,14 +112,14 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           projectId,
-          data
+          data,
         }: {
           projectId: string;
           data: {
             email: string;
             permissions: Permission[];
           };
-        }
+        },
       ) => {
         try {
           return Boolean(await service.addProjectMember(projectId, data));
@@ -119,15 +133,15 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           projectId,
-          data
+          data,
         }: {
           projectId: string;
           data: { environments: string[]; key: string; value: string }[];
-        }
+        },
       ) => {
         try {
           return Boolean(
-            await service.addEnvironmentVariables(projectId, data)
+            await service.addEnvironmentVariables(projectId, data),
           );
         } catch (err) {
           log(err);
@@ -139,16 +153,16 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           environmentVariableId,
-          data
+          data,
         }: {
           environmentVariableId: string;
           data: DeepPartial<EnvironmentVariable>;
-        }
+        },
       ) => {
         try {
           return await service.updateEnvironmentVariable(
             environmentVariableId,
-            data
+            data,
           );
         } catch (err) {
           log(err);
@@ -158,7 +172,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       removeEnvironmentVariable: async (
         _: any,
-        { environmentVariableId }: { environmentVariableId: string }
+        { environmentVariableId }: { environmentVariableId: string },
       ) => {
         try {
           return await service.removeEnvironmentVariable(environmentVariableId);
@@ -171,10 +185,12 @@ export const createResolvers = async (service: Service): Promise<any> => {
       updateDeploymentToProd: async (
         _: any,
         { deploymentId }: { deploymentId: string },
-        context: any
+        context: any,
       ) => {
         try {
-          return Boolean(await service.updateDeploymentToProd(context.user, deploymentId));
+          return Boolean(
+            await service.updateDeploymentToProd(context.user, deploymentId),
+          );
         } catch (err) {
           log(err);
           return false;
@@ -185,9 +201,9 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           organizationSlug,
-          data
+          data,
         }: { organizationSlug: string; data: DeepPartial<Project> },
-        context: any
+        context: any,
       ) => {
         try {
           return await service.addProject(context.user, organizationSlug, data);
@@ -199,7 +215,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       updateProject: async (
         _: any,
-        { projectId, data }: { projectId: string; data: DeepPartial<Project> }
+        { projectId, data }: { projectId: string; data: DeepPartial<Project> },
       ) => {
         try {
           return await service.updateProject(projectId, data);
@@ -212,10 +228,12 @@ export const createResolvers = async (service: Service): Promise<any> => {
       redeployToProd: async (
         _: any,
         { deploymentId }: { deploymentId: string },
-        context: any
+        context: any,
       ) => {
         try {
-          return Boolean(await service.redeployToProd(context.user, deploymentId));
+          return Boolean(
+            await service.redeployToProd(context.user, deploymentId),
+          );
         } catch (err) {
           log(err);
           return false;
@@ -244,8 +262,8 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           projectId,
-          deploymentId
-        }: { deploymentId: string; projectId: string }
+          deploymentId,
+        }: { deploymentId: string; projectId: string },
       ) => {
         try {
           return await service.rollbackDeployment(projectId, deploymentId);
@@ -257,9 +275,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       deleteDeployment: async (
         _: any,
-        {
-          deploymentId
-        }: { deploymentId: string; }
+        { deploymentId }: { deploymentId: string },
       ) => {
         try {
           return await service.deleteDeployment(deploymentId);
@@ -271,7 +287,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       addDomain: async (
         _: any,
-        { projectId, data }: { projectId: string; data: { name: string } }
+        { projectId, data }: { projectId: string; data: { name: string } },
       ) => {
         try {
           return Boolean(await service.addDomain(projectId, data));
@@ -283,7 +299,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       updateDomain: async (
         _: any,
-        { domainId, data }: { domainId: string; data: DeepPartial<Domain> }
+        { domainId, data }: { domainId: string; data: DeepPartial<Domain> },
       ) => {
         try {
           return await service.updateDomain(domainId, data);
@@ -296,7 +312,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
       authenticateGitHub: async (
         _: any,
         { code }: { code: string },
-        context: any
+        context: any,
       ) => {
         try {
           return await service.authenticateGitHub(code, context.user);
@@ -308,12 +324,14 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       unauthenticateGitHub: async (_: any, __: object, context: any) => {
         try {
-          return service.unauthenticateGitHub(context.user, { gitHubToken: null });
+          return service.unauthenticateGitHub(context.user, {
+            gitHubToken: null,
+          });
         } catch (err) {
           log(err);
           return false;
         }
-      }
-    }
+      },
+    },
   };
 };

packages/backend/src/routes/auth.ts

@@ -19,6 +19,7 @@ router.get('/registration/:email', async (req, res) => {
 });
 
 router.post('/register', async (req, res) => {
+  console.log('Register', req.body);
   const { email, challenge, attestation } = req.body;
   const user = await createUser(req.app.get('service'), {
     challenge,
@@ -31,6 +32,7 @@ router.post('/register', async (req, res) => {
 });
 
 router.post('/authenticate', async (req, res) => {
+  console.log('Authenticate', req.body);
   const { signedWhoamiRequest } = req.body;
   const user = await authenticateUser(
     req.app.get('service'),

packages/backend/src/routes/staging.ts

@@ -0,0 +1,9 @@
+import { Router } from 'express';
+
+const router = Router();
+
+router.get('/version', async (req, res) => {
+  return res.send({ version: '0.0.6' });
+});
+
+export default router;

packages/backend/src/server.ts

@@ -17,6 +17,7 @@ import { ServerConfig } from './config';
 import { DEFAULT_GQL_PATH } from './constants';
 import githubRouter from './routes/github';
 import authRouter from './routes/auth';
+import stagingRouter from './routes/staging';
 import { Service } from './service';
 
 const log = debug('snowball:server');
@@ -109,6 +110,12 @@ export const createAndStartServer = async (
   app.set('service', service);
   app.use('/auth', authRouter);
   app.use('/api/github', githubRouter);
+  app.use('/staging', stagingRouter);
+
+  app.use((err: any, req: any, res: any, next: any) => {
+    console.error(err);
+    res.status(500).json({ error: 'Internal Server Error' });
+  });
 
   httpServer.listen(port, host, () => {
     log(`Server is listening on ${host}:${port}${server.graphqlPath}`);

packages/deployer/config.staging.yml

@@ -3,7 +3,7 @@ services:
     restEndpoint: 'http://console.laconic.com:1317'
     gqlEndpoint: 'http://console.laconic.com:9473/api'
     userKey: 87d00f66a73e2ca428adeb49ba9164d0ad9a87edc60e33d46ad3031b9c5701fe
-    bondId: 098c906850b87412f02200e41f449bc79e055eab77acfef32c0b22443bb46661
+    bondId: 89c75c7bc5759861d10285aff6f9e7227d6855e446b77ad5d8324822dfec7deb
     chainId: laconic_9000-1
-    gas: 550000
+    gas: 1200000
     fees: 200000aphoton

packages/deployer/deploy-frontend.sh

@@ -64,7 +64,13 @@ echo "Files generated successfully."
 RECORD_FILE=records/application-record.yml
 
 # Publish ApplicationRecord
-RECORD_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE | jq -r '.id')
+publish_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to publish record"
+  exit $rc
+fi
+RECORD_ID=$(echo $publish_response | jq -r '.id')
 echo "ApplicationRecord published"
 echo $RECORD_ID
 
@@ -73,15 +79,36 @@ REGISTRY_APP_CRN="crn://snowballtools/applications/snowballtools-base-frontend"
 
 sleep 2
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${PACKAGE_VERSION}" "$RECORD_ID"
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to set name: $REGISTRY_APP_CRN@${PACKAGE_VERSION}"
+  exit $rc
+fi
 sleep 2
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${LATEST_HASH}" "$RECORD_ID"
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to set hash"
+  exit $rc
+fi
 sleep 2
 # Set name if latest release
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN" "$RECORD_ID"
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to set release"
+  exit $rc
+fi
 echo "$REGISTRY_APP_CRN set for ApplicationRecord"
 
 # Check if record found for REGISTRY_APP_CRN
-APP_RECORD=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN" | jq '.[0]')
+query_response=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN")
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to query name"
+  exit $rc
+fi
+APP_RECORD=$(echo $query_response | jq '.[0]')
 if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
   echo "No record found for $REGISTRY_APP_CRN."
   exit 1
@@ -90,6 +117,11 @@ fi
 RECORD_FILE=records/application-deployment-request.yml
 
 sleep 2
-DEPLOYMENT_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE | jq -r '.id')
+deployment_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to query deployment request"
+  exit $rc
+fi
+DEPLOYMENT_REQUEST_ID=$(echo $deployment_response | jq -r '.id')
 echo "ApplicationDeploymentRequest published"
 echo $DEPLOYMENT_REQUEST_ID

packages/deployer/deploy-frontend.staging.sh

@@ -44,7 +44,7 @@ record:
       LACONIC_HOSTED_CONFIG_lit_relay_api_key: 15DDD969-E75F-404D-AAD9-58A37C4FD354_snowball
       LACONIC_HOSTED_CONFIG_aplchemy_api_key: THvPart_gqI5x02RNYSBntlmwA66I_qc
       LACONIC_HOSTED_CONFIG_bugsnag_api_key: 8c480cd5386079f9dd44f9581264a073
-      LACONIC_HOSTED_CONFIG_passkey_wallet_rpid: localhost
+      LACONIC_HOSTED_CONFIG_passkey_wallet_rpid: dashboard.staging.apps.snowballtools.com
       LACONIC_HOSTED_CONFIG_turnkey_api_base_url: https://api.turnkey.com/
       LACONIC_HOSTED_CONFIG_turnkey_organization_id: 5049ae99-5bca-40b3-8317-504384d4e591
   meta:
@@ -70,7 +70,13 @@ echo "Files generated successfully."
 RECORD_FILE=staging-records/application-record.yml
 
 # Publish ApplicationRecord
-RECORD_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE | jq -r '.id')
+publish_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to publish record"
+  exit $rc
+fi
+RECORD_ID=$(echo $publish_response | jq -r '.id')
 echo "ApplicationRecord published"
 echo $RECORD_ID
 
@@ -79,15 +85,36 @@ REGISTRY_APP_CRN="crn://staging-snowballtools/applications/staging-snowballtools
 
 sleep 2
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${PACKAGE_VERSION}" "$RECORD_ID"
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to set name: $REGISTRY_APP_CRN@${PACKAGE_VERSION}"
+  exit $rc
+fi
 sleep 2
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${LATEST_HASH}" "$RECORD_ID"
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to set hash"
+  exit $rc
+fi
 sleep 2
 # Set name if latest release
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN" "$RECORD_ID"
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to set release"
+  exit $rc
+fi
 echo "$REGISTRY_APP_CRN set for ApplicationRecord"
 
 # Check if record found for REGISTRY_APP_CRN
-APP_RECORD=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN" | jq '.[0]')
+query_response=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN")
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to query name"
+  exit $rc
+fi
+APP_RECORD=$(echo $query_response | jq '.[0]')
 if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
   echo "No record found for $REGISTRY_APP_CRN."
   exit 1
@@ -96,6 +123,11 @@ fi
 RECORD_FILE=staging-records/application-deployment-request.yml
 
 sleep 2
-DEPLOYMENT_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE | jq -r '.id')
+deployment_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to query deployment request"
+  exit $rc
+fi
+DEPLOYMENT_REQUEST_ID=$(echo $deployment_response | jq -r '.id')
 echo "ApplicationDeploymentRequest published"
 echo $DEPLOYMENT_REQUEST_ID

packages/frontend/src/components/SearchBar.tsx

@@ -6,7 +6,7 @@ import { Input, InputProps } from './shared/Input';
 const SearchBar: React.ForwardRefRenderFunction<
   HTMLInputElement,
   InputProps & RefAttributes<HTMLInputElement>
-> = ({ value, onChange, placeholder = 'Search', ...props }) => {
+> = ({ value, onChange, placeholder = 'Search', ...props }, ref) => {
   return (
     <div className="relative flex w-full">
       <Input
@@ -18,6 +18,7 @@ const SearchBar: React.ForwardRefRenderFunction<
         appearance="borderless"
         className="w-full lg:w-[459px]"
         {...props}
+        ref={ref}
       />
     </div>
   );

packages/frontend/src/components/projects/project/deployments/AssignDomainDialog.tsx

@@ -1,13 +1,8 @@
 import { CopyBlock, atomOneLight } from 'react-code-blocks';
 import { Link } from 'react-router-dom';
 
-import {
-  Button,
-  Dialog,
-  DialogHeader,
-  DialogBody,
-  DialogFooter,
-} from '@snowballtools/material-tailwind-react-fork';
+import { Modal } from 'components/shared/Modal';
+import { Button } from 'components/shared/Button';
 
 interface AssignDomainProps {
   open: boolean;
@@ -16,36 +11,31 @@ interface AssignDomainProps {
 
 const AssignDomainDialog = ({ open, handleOpen }: AssignDomainProps) => {
   return (
-    <Dialog open={open} handler={handleOpen}>
-      <DialogHeader>Assign Domain</DialogHeader>
-      <DialogBody>
-        In order to assign a domain to your production deployments, configure it
-        in the{' '}
-        {/* TODO: Fix selection of project settings tab on navigation to domains */}
-        <Link to="../settings/domains" className="text-light-blue-800 inline">
-          project settings{' '}
-        </Link>
-        (recommended). If you want to assign to this specific deployment,
-        however, you can do so using our command-line interface:
-        {/* https://github.com/rajinwonderland/react-code-blocks/issues/138 */}
-        <CopyBlock
-          text="snowball alias <deployment> <domain>"
-          language=""
-          showLineNumbers={false}
-          theme={atomOneLight}
-        />
-      </DialogBody>
-      <DialogFooter className="flex justify-start">
-        <Button
-          className="rounded-3xl"
-          variant="gradient"
-          color="blue"
-          onClick={handleOpen}
-        >
-          <span>Okay</span>
-        </Button>
-      </DialogFooter>
-    </Dialog>
+    <Modal open={open} onOpenChange={handleOpen}>
+      <Modal.Content>
+        <Modal.Header>Assign Domain</Modal.Header>
+        <Modal.Body>
+          In order to assign a domain to your production deployments, configure
+          it in the{' '}
+          {/* TODO: Fix selection of project settings tab on navigation to domains */}
+          <Link to="../settings/domains" className="text-light-blue-800 inline">
+            project settings{' '}
+          </Link>
+          (recommended). If you want to assign to this specific deployment,
+          however, you can do so using our command-line interface:
+          {/* https://github.com/rajinwonderland/react-code-blocks/issues/138 */}
+          <CopyBlock
+            text="snowball alias <deployment> <domain>"
+            language=""
+            showLineNumbers={false}
+            theme={atomOneLight}
+          />
+        </Modal.Body>
+        <Modal.Footer className="flex justify-start">
+          <Button onClick={handleOpen}>Okay</Button>
+        </Modal.Footer>
+      </Modal.Content>
+    </Modal>
   );
 };
 

packages/frontend/src/components/shared/Input/Input.tsx

@@ -4,7 +4,6 @@ import {
   useMemo,
   ComponentPropsWithoutRef,
 } from 'react';
-import { FieldValues, UseFormRegister } from 'react-hook-form';
 
 import { WarningIcon } from 'components/shared/CustomIcon';
 import { cloneIcon } from 'utils/cloneIcon';
@@ -12,7 +11,7 @@ import { cn } from 'utils/classnames';
 
 import { InputTheme, inputTheme } from './Input.theme';
 
-export interface InputProps<T extends FieldValues = FieldValues>
+export interface InputProps
   extends InputTheme,
     Omit<ComponentPropsWithoutRef<'input'>, 'size'> {
   label?: string;
@@ -20,9 +19,6 @@ export interface InputProps<T extends FieldValues = FieldValues>
   leftIcon?: ReactNode;
   rightIcon?: ReactNode;
   helperText?: string;
-
-  // react-hook-form optional register
-  register?: ReturnType<UseFormRegister<T>>;
 }
 
 const Input = forwardRef<HTMLInputElement, InputProps>(
@@ -34,7 +30,6 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
       leftIcon,
       rightIcon,
       helperText,
-      register,
       size,
       state,
       appearance,
@@ -107,12 +102,11 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
         <div className={containerCls({ class: className })}>
           {leftIcon && renderLeftIcon}
           <input
-            {...(register ? register : {})}
             className={cn(inputCls(), {
               'pl-10': leftIcon,
             })}
-            {...props}
             ref={ref}
+            {...props}
           />
           {rightIcon && renderRightIcon}
         </div>

packages/frontend/src/components/shared/UserSelect/UserSelect.tsx

@@ -103,10 +103,12 @@ export const UserSelect = ({ options, value }: UserSelectProps) => {
     <div className={theme.container()}>
       {/* Input */}
       <div
-        {...getToggleButtonProps({
-          ref: inputWrapperRef,
-          suppressRefError: true,
-        })}
+        {...getToggleButtonProps(
+          {
+            ref: inputWrapperRef,
+          },
+          { suppressRefError: true },
+        )}
         onClick={() => !dropdownOpen && openMenu()}
         className="cursor-pointer relative py-2 pl-2 pr-4 flex min-w-[200px] w-full items-center justify-between rounded-xl bg-surface-card shadow-sm"
       >

packages/frontend/src/index.tsx

@@ -15,6 +15,9 @@ import { SERVER_GQL_PATH } from './constants';
 import { Toaster } from 'components/shared/Toast';
 import { LogErrorBoundary } from 'utils/log-error';
 
+// @ts-ignore
+console.log(`v-${__VERSION__}`);
+
 const root = ReactDOM.createRoot(
   document.getElementById('root') as HTMLElement,
 );

packages/frontend/src/pages/auth/Login.tsx

@@ -47,7 +47,9 @@ export const Login = ({ onDone }: Props) => {
       console.log('Handling google redirect back');
       try {
         await google.handleOAuthRedirectBack();
+        // @ts-ignore
         wallet = await google.getEthersWallet();
+        // @ts-ignore
         const result = await signInWithEthereum(1, 'login', wallet);
         if (result.error) {
           setError(result.error);

packages/frontend/src/pages/auth/SignUp.tsx

@@ -45,7 +45,9 @@ export const SignUp = ({ onDone }: Props) => {
       setProvider('google');
       try {
         await google.handleOAuthRedirectBack();
+        // @ts-ignore
         wallet = await google.getEthersWallet();
+        // @ts-ignore
         const result = await signInWithEthereum(1, 'signup', wallet);
         if (result.error) {
           setError({ type: 'provider', message: result.error });

packages/frontend/vite.config.ts

@@ -1,5 +1,7 @@
 import { defineConfig, PluginOption } from 'vite';
 import react from '@vitejs/plugin-react';
+import { exec } from 'child_process';
+import { promisify } from 'util';
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -16,5 +18,8 @@ export default defineConfig({
   },
   define: {
     'process.env': {},
+    __VERSION__: JSON.stringify(
+      (await promisify(exec)('git rev-parse --short HEAD')).stdout.trim(),
+    ),
   },
 });

packages/gql-client/dist/index.mjs

@@ -20,7 +20,10 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/client.ts
-import { ApolloClient, InMemoryCache } from "@apollo/client";
+import {
+  ApolloClient,
+  InMemoryCache
+} from "@apollo/client";
 
 // src/queries.ts
 import { gql } from "@apollo/client";

packages/gql-client/src/client.ts

@@ -1,8 +1,13 @@
-import { ApolloClient, DefaultOptions, InMemoryCache, NormalizedCacheObject } from '@apollo/client';
+import {
+  ApolloClient,
+  DefaultOptions,
+  InMemoryCache,
+  NormalizedCacheObject,
+} from "@apollo/client";
 
-import * as queries from './queries';
-import * as types from './types';
-import * as mutations from './mutations';
+import * as queries from "./queries";
+import * as types from "./types";
+import * as mutations from "./mutations";
 
 export interface GraphQLConfig {
   gqlEndpoint: string;
@@ -11,320 +16,372 @@ export interface GraphQLConfig {
 // TODO: check options
 const defaultOptions: DefaultOptions = {
   watchQuery: {
-    fetchPolicy: 'no-cache',
-    errorPolicy: 'ignore'
+    fetchPolicy: "no-cache",
+    errorPolicy: "ignore",
   },
   query: {
-    fetchPolicy: 'no-cache',
-    errorPolicy: 'all'
-  }
+    fetchPolicy: "no-cache",
+    errorPolicy: "all",
+  },
 };
 
 export class GQLClient {
   private client: ApolloClient<NormalizedCacheObject>;
 
-  constructor (config: GraphQLConfig) {
+  constructor(config: GraphQLConfig) {
     this.client = new ApolloClient({
       uri: config.gqlEndpoint,
       cache: new InMemoryCache(),
       defaultOptions,
-      credentials: 'include'
+      credentials: "include",
     });
   }
 
-  async getUser () : Promise<types.GetUserResponse> {
+  async getUser(): Promise<types.GetUserResponse> {
     const { data } = await this.client.query({
-      query: queries.getUser
+      query: queries.getUser,
     });
 
     return data;
   }
 
-  async getProject (projectId: string) : Promise<types.GetProjectResponse> {
+  async getProject(projectId: string): Promise<types.GetProjectResponse> {
     const { data } = await this.client.query({
       query: queries.getProject,
       variables: {
-        projectId
-      }
+        projectId,
+      },
     });
 
     return data;
   }
 
-  async getProjectsInOrganization (organizationSlug: string) : Promise<types.GetProjectsInOrganizationResponse> {
+  async getProjectsInOrganization(
+    organizationSlug: string
+  ): Promise<types.GetProjectsInOrganizationResponse> {
     const { data } = await this.client.query({
       query: queries.getProjectsInOrganization,
       variables: {
-        organizationSlug
-      }
+        organizationSlug,
+      },
     });
 
     return data;
   }
 
-  async getOrganizations () : Promise<types.GetOrganizationsResponse> {
+  async getOrganizations(): Promise<types.GetOrganizationsResponse> {
     const { data } = await this.client.query({
-      query: queries.getOrganizations
+      query: queries.getOrganizations,
     });
 
     return data;
   }
 
-  async getDeployments (projectId: string) : Promise<types.GetDeploymentsResponse> {
+  async getDeployments(
+    projectId: string
+  ): Promise<types.GetDeploymentsResponse> {
     const { data } = await this.client.query({
       query: queries.getDeployments,
       variables: {
-        projectId
-      }
+        projectId,
+      },
     });
 
     return data;
   }
 
-  async getEnvironmentVariables (projectId: string) : Promise<types.GetEnvironmentVariablesResponse> {
+  async getEnvironmentVariables(
+    projectId: string
+  ): Promise<types.GetEnvironmentVariablesResponse> {
     const { data } = await this.client.query({
       query: queries.getEnvironmentVariables,
       variables: {
-        projectId
-      }
+        projectId,
+      },
     });
 
     return data;
   }
 
-  async getProjectMembers (projectId: string) : Promise<types.GetProjectMembersResponse> {
+  async getProjectMembers(
+    projectId: string
+  ): Promise<types.GetProjectMembersResponse> {
     const result = await this.client.query({
       query: queries.getProjectMembers,
       variables: {
-        projectId
-      }
+        projectId,
+      },
     });
 
     return result.data;
   }
 
-  async addProjectMember (projectId: string, data: types.AddProjectMemberInput) : Promise<types.AddProjectMemberResponse> {
+  async addProjectMember(
+    projectId: string,
+    data: types.AddProjectMemberInput
+  ): Promise<types.AddProjectMemberResponse> {
     const result = await this.client.mutate({
       mutation: mutations.addProjectMember,
       variables: {
         projectId,
-        data
-      }
+        data,
+      },
     });
 
     return result.data;
   }
 
-  async updateProjectMember (projectMemberId: string, data: types.UpdateProjectMemberInput): Promise<types.UpdateProjectMemberResponse> {
+  async updateProjectMember(
+    projectMemberId: string,
+    data: types.UpdateProjectMemberInput
+  ): Promise<types.UpdateProjectMemberResponse> {
     const result = await this.client.mutate({
       mutation: mutations.updateProjectMember,
       variables: {
         projectMemberId,
-        data
-      }
+        data,
+      },
     });
 
     return result.data;
   }
 
-  async removeProjectMember (projectMemberId: string): Promise<types.RemoveProjectMemberResponse> {
+  async removeProjectMember(
+    projectMemberId: string
+  ): Promise<types.RemoveProjectMemberResponse> {
     const result = await this.client.mutate({
       mutation: mutations.removeProjectMember,
       variables: {
-        projectMemberId
-      }
+        projectMemberId,
+      },
     });
 
     return result.data;
   }
 
-  async searchProjects (searchText: string) : Promise<types.SearchProjectsResponse> {
+  async searchProjects(
+    searchText: string
+  ): Promise<types.SearchProjectsResponse> {
     const { data } = await this.client.query({
       query: queries.searchProjects,
       variables: {
-        searchText
-      }
+        searchText,
+      },
     });
 
     return data;
   }
 
-  async addEnvironmentVariables (projectId: string, data: types.AddEnvironmentVariableInput[]): Promise<types.AddEnvironmentVariablesResponse> {
+  async addEnvironmentVariables(
+    projectId: string,
+    data: types.AddEnvironmentVariableInput[]
+  ): Promise<types.AddEnvironmentVariablesResponse> {
     const result = await this.client.mutate({
       mutation: mutations.addEnvironmentVariables,
       variables: {
         projectId,
-        data
-      }
+        data,
+      },
     });
 
     return result.data;
   }
 
-  async updateEnvironmentVariable (environmentVariableId: string, data: types.UpdateEnvironmentVariableInput): Promise<types.UpdateEnvironmentVariableResponse> {
+  async updateEnvironmentVariable(
+    environmentVariableId: string,
+    data: types.UpdateEnvironmentVariableInput
+  ): Promise<types.UpdateEnvironmentVariableResponse> {
     const result = await this.client.mutate({
       mutation: mutations.updateEnvironmentVariable,
       variables: {
         environmentVariableId,
-        data
-      }
+        data,
+      },
     });
 
     return result.data;
   }
 
-  async removeEnvironmentVariable (environmentVariableId: string): Promise<types.RemoveEnvironmentVariableResponse> {
+  async removeEnvironmentVariable(
+    environmentVariableId: string
+  ): Promise<types.RemoveEnvironmentVariableResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.removeEnvironmentVariable,
       variables: {
-        environmentVariableId
-      }
+        environmentVariableId,
+      },
     });
 
     return data;
   }
 
-  async updateDeploymentToProd (deploymentId: string): Promise<types.UpdateDeploymentToProdResponse> {
+  async updateDeploymentToProd(
+    deploymentId: string
+  ): Promise<types.UpdateDeploymentToProdResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.updateDeploymentToProd,
       variables: {
-        deploymentId
-      }
+        deploymentId,
+      },
     });
 
     return data;
   }
 
-  async addProject (organizationSlug: string, data: types.AddProjectInput): Promise<types.AddProjectResponse> {
+  async addProject(
+    organizationSlug: string,
+    data: types.AddProjectInput
+  ): Promise<types.AddProjectResponse> {
     const result = await this.client.mutate({
       mutation: mutations.addProject,
       variables: {
         organizationSlug,
-        data
-      }
+        data,
+      },
     });
 
     return result.data;
   }
 
-  async updateProject (projectId: string, data: types.UpdateProjectInput): Promise<types.UpdateProjectResponse> {
+  async updateProject(
+    projectId: string,
+    data: types.UpdateProjectInput
+  ): Promise<types.UpdateProjectResponse> {
     const result = await this.client.mutate({
       mutation: mutations.updateProjectMutation,
       variables: {
         projectId,
-        data
-      }
+        data,
+      },
     });
 
     return result.data;
   }
 
-  async updateDomain (domainId: string, data: types.UpdateDomainInput): Promise<types.UpdateDomainResponse> {
+  async updateDomain(
+    domainId: string,
+    data: types.UpdateDomainInput
+  ): Promise<types.UpdateDomainResponse> {
     const result = await this.client.mutate({
       mutation: mutations.updateDomainMutation,
       variables: {
         domainId,
-        data
-      }
+        data,
+      },
     });
 
     return result.data;
   }
 
-  async redeployToProd (deploymentId: string): Promise<types.RedeployToProdResponse> {
+  async redeployToProd(
+    deploymentId: string
+  ): Promise<types.RedeployToProdResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.redeployToProd,
       variables: {
-        deploymentId
-      }
+        deploymentId,
+      },
     });
 
     return data;
   }
 
-  async deleteProject (projectId: string): Promise<types.DeleteProjectResponse> {
+  async deleteProject(projectId: string): Promise<types.DeleteProjectResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.deleteProject,
       variables: {
-        projectId
-      }
+        projectId,
+      },
     });
 
     return data;
   }
 
-  async deleteDomain (domainId: string): Promise<types.DeleteDomainResponse> {
+  async deleteDomain(domainId: string): Promise<types.DeleteDomainResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.deleteDomain,
       variables: {
-        domainId
-      }
+        domainId,
+      },
     });
 
     return data;
   }
 
-  async rollbackDeployment (projectId: string, deploymentId: string): Promise<types.RollbackDeploymentResponse> {
+  async rollbackDeployment(
+    projectId: string,
+    deploymentId: string
+  ): Promise<types.RollbackDeploymentResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.rollbackDeployment,
       variables: {
         projectId,
-        deploymentId
-      }
+        deploymentId,
+      },
     });
 
     return data;
   }
 
-  async deleteDeployment (deploymentId: string): Promise<types.DeleteDeploymentResponse> {
+  async deleteDeployment(
+    deploymentId: string
+  ): Promise<types.DeleteDeploymentResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.deleteDeployment,
       variables: {
-        deploymentId
-      }
+        deploymentId,
+      },
     });
 
     return data;
   }
 
-  async addDomain (projectId: string, data: types.AddDomainInput): Promise<types.AddDomainResponse> {
+  async addDomain(
+    projectId: string,
+    data: types.AddDomainInput
+  ): Promise<types.AddDomainResponse> {
     const result = await this.client.mutate({
       mutation: mutations.addDomain,
       variables: {
         projectId,
-        data
-      }
+        data,
+      },
     });
 
     return result.data;
   }
 
-  async getDomains (projectId: string, filter?: types.FilterDomainInput): Promise<types.GetDomainsResponse> {
+  async getDomains(
+    projectId: string,
+    filter?: types.FilterDomainInput
+  ): Promise<types.GetDomainsResponse> {
     const { data } = await this.client.query({
       query: queries.getDomains,
       variables: {
         projectId,
-        filter
-      }
+        filter,
+      },
     });
 
     return data;
   }
 
-  async authenticateGitHub (code: string): Promise<types.AuthenticateGitHubResponse> {
+  async authenticateGitHub(
+    code: string
+  ): Promise<types.AuthenticateGitHubResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.authenticateGitHub,
       variables: {
-        code
-      }
+        code,
+      },
     });
 
     return data;
   }
 
-  async unauthenticateGithub (): Promise<types.UnauthenticateGitHubResponse> {
+  async unauthenticateGithub(): Promise<types.UnauthenticateGitHubResponse> {
     const { data } = await this.client.mutate({
-      mutation: mutations.unauthenticateGitHub
+      mutation: mutations.unauthenticateGitHub,
     });
 
     return data;

yarn.lock

@@ -10575,6 +10575,11 @@ exponential-backoff@^3.1.1:
   resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
   integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
 
+express-async-errors@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/express-async-errors/-/express-async-errors-3.1.1.tgz#6053236d61d21ddef4892d6bd1d736889fc9da41"
+  integrity sha512-h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng==
+
 express-session@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.18.0.tgz#a6ae39d9091f2efba5f20fc5c65a3ce7c9ce16a3"