fix: remove inline script from index.html

sasjs · Jul 26, 2022 · 170a9e9 · 170a9e9
1 parent efab88b
commit 170a9e9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/src/context/sasContext.tsx b/src/context/sasContext.tsx
@@ -26,13 +26,24 @@ interface SASContextProps {
   startupData: any
 }
 
-declare global {
-  interface Window {
-    sasjsConfig: SASjsConfig
-  }
-}
+const sasElement = document.querySelector('sasjs')
+
+const useComputeApi = sasElement?.getAttribute('useComputeApi')
 
-const sasjsConfig = window.sasjsConfig as SASjsConfig
+const sasjsConfig = {
+  serverUrl: sasElement?.getAttribute('serverUrl') ?? undefined,
+  appLoc: sasElement?.getAttribute('appLoc') ?? undefined,
+  serverType: sasElement?.getAttribute('serverType'),
+  debug: sasElement?.getAttribute('debug') === 'true',
+  loginMechanism: sasElement?.getAttribute('loginMechanism') ?? undefined,
+  useComputeApi:
+    useComputeApi === 'true'
+      ? true
+      : useComputeApi === 'false'
+      ? false
+      : useComputeApi,
+  contextName: sasElement?.getAttribute('contextName') ?? undefined
+} as SASjsConfig
 
 const sasService = new SASjs(sasjsConfig)
 

diff --git a/src/index.html b/src/index.html
@@ -32,6 +32,11 @@
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
+    <sasjs
+      appLoc="/Public/app/react-seed-app"
+      serverType="SASJS"
+      debug="false"
+    ></sasjs>
     <div id="root"></div>
     <!--
       This HTML file is a template.
@@ -43,14 +48,5 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-    <script>
-      window.sasjsConfig = {
-        serverUrl: 'https://sas.analytium.co.uk:5000',
-        appLoc: '/Public/app/react-seed-app',
-        serverType: 'SASJS',
-        debug: false,
-        loginMechanism: 'Redirected'
-      }
-    </script>
   </body>
 </html>
diff --git a/src/layouts/Main.jsx b/src/layouts/Main.jsx
@@ -193,7 +193,8 @@ const Main = (props) => {
         />
       </div>
       {!(
-        window.sasjsConfig.loginMechanism === 'Redirected' ||
+        document.querySelector('sasjs')?.getAttribute('loginMechanism') ===
+          'Redirected' ||
         sasContext.isUserLoggedIn ||
         sasContext.checkingSession
       ) && <LoginComponent />}