From 7634db34db60816f19ff71b43088f5eef98b831e Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Tue, 3 Sep 2024 11:32:32 +0200
Subject: [PATCH] fix scope ui to enum, fix pubkey check

---
 frontend/app/PrivateRoutes.tsx       | 8 ++++----
 frontend/app/mstore/spotStore.ts     | 2 +-
 frontend/app/services/spotService.ts | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/app/PrivateRoutes.tsx b/frontend/app/PrivateRoutes.tsx
index 22db28530..966f73bc5 100644
--- a/frontend/app/PrivateRoutes.tsx
+++ b/frontend/app/PrivateRoutes.tsx
@@ -113,14 +113,14 @@ interface Props {
   siteId: string;
   sites: Map<string, any>;
   onboarding: boolean;
-  spotOnly?: boolean;
+  scope: number;
 }
 
 function PrivateRoutes(props: Props) {
   const { onboarding, sites, siteId } = props;
   const hasRecordings = sites.some(s => s.recorded);
   const redirectToOnboarding =
-    !onboarding && (localStorage.getItem(GLOBAL_HAS_NO_RECORDINGS) === 'true' || !hasRecordings);
+    !onboarding && (localStorage.getItem(GLOBAL_HAS_NO_RECORDINGS) === 'true' || !hasRecordings) && props.scope > 0;
   const siteIdList: any = sites.map(({ id }) => id).toJS();
 
   return (
@@ -149,7 +149,7 @@ function PrivateRoutes(props: Props) {
           path={SCOPE_SETUP}
           component={enhancedComponents.ScopeSetup}
         />
-        {props.spotOnly ? <Redirect to={SPOTS_LIST_PATH} /> : null}
+        {props.scope === 1 ? <Redirect to={SPOTS_LIST_PATH} /> : null}
         <Route
           path="/integrations/"
           render={({ location }) => {
@@ -289,8 +289,8 @@ function PrivateRoutes(props: Props) {
 
 export default connect((state: any) => ({
   onboarding: state.getIn(['user', 'onboarding']),
+  scope: getScope(state),
   sites: state.getIn(['site', 'list']),
   siteId: state.getIn(['site', 'siteId']),
-  spotOnly: getScope(state) === 1,
   tenantId: state.getIn(['user', 'account', 'tenantId']),
 }))(PrivateRoutes);
diff --git a/frontend/app/mstore/spotStore.ts b/frontend/app/mstore/spotStore.ts
index 5091ff279..1442ed2e8 100644
--- a/frontend/app/mstore/spotStore.ts
+++ b/frontend/app/mstore/spotStore.ts
@@ -185,7 +185,7 @@ export default class SpotStore {
   checkIsProcessed = async (id: string) => {
     try {
       const { status } = await this.withLoader(() => {
-        return spotService.checkProcessingStatus(id);
+        return spotService.checkProcessingStatus(id, this.accessKey);
       })
 
       return status === 'processed';
diff --git a/frontend/app/services/spotService.ts b/frontend/app/services/spotService.ts
index 5031276f8..55e5273a3 100644
--- a/frontend/app/services/spotService.ts
+++ b/frontend/app/services/spotService.ts
@@ -97,8 +97,8 @@ export default class SpotService extends BaseService {
       .catch(console.error)
   }
 
-  async checkProcessingStatus(id: string) {
-    return this.client.get(`/spot/v1/spots/${id}/status`)
+  async checkProcessingStatus(id: string, accessKey?: string) {
+    return this.client.get(`/spot/v1/spots/${id}/status${accessKey ? `?key=${accessKey}` : ''}`)
       .then(r => r.json())
       .catch(console.error)
   }