feat: login with redirected mechanism

sasjs · Sep 9, 2021 · 059db9f · 059db9f
1 parent 4275a7f
commit 059db9f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/src/index.html b/src/index.html
@@ -11,10 +11,11 @@
     <script>
       function initSasJs() {
         sasjs = new SASjs.default({
-          appLoc: '/Public/app/minimal-seed-app',
+          appLoc: '/Public/app2/minimal-seed-app',
           serverType: 'SASVIYA',
           serverUrl: '',
           debug: false,
+          loginMechanism: 'Redirected',
         })
         sasjs.checkSession().then((res) => {
           if (res.isLoggedIn) afterLogin()

diff --git a/src/sasjs.js b/src/sasjs.js
diff --git a/src/scripts.js b/src/scripts.js
@@ -1,11 +1,12 @@
 let sasjs
+let username
+let password
 
 function login() {
-  const username = document.querySelector('#username').value
-  const password = document.querySelector('#password').value
+  username = document.querySelector('#username').value
+  password = document.querySelector('#password').value
   sasjs.logIn(username, password).then((response) => {
-    if (response.login === false) {
-    } else {
+    if (response.isLoggedIn) {
       afterLogin()
     }
   })
@@ -23,8 +24,13 @@ function afterLogin() {
 }
 
 function loadStartupData() {
-  if (sasjs) {
-    sasjs.request('services/common/appinit', null, true).then((response) => {
+  if (!sasjs) return
+
+  sasjs
+    .request('services/common/appinit', null, undefined, async () => {
+      await sasjs.logIn(username, password)
+    })
+    .then((response) => {
       let responseJson
       try {
         responseJson = response
@@ -42,16 +48,20 @@ function loadStartupData() {
         }
       }
     })
-  }
 }
 
 function loadData() {
   const areasDropdown = document.querySelector('#areas-dropdown')
   const selectedArea = areasDropdown.options[areasDropdown.selectedIndex].value
   sasjs
-    .request('services/common/getdata', {
-      areas: [{ area: selectedArea }],
-    })
+    .request(
+      'services/common/getdata',
+      { areas: [{ area: selectedArea }] },
+      undefined,
+      async () => {
+        await sasjs.logIn(username, password)
+      }
+    )
     .then((response) => {
       const responseJson = response
       if (responseJson && responseJson.springs && responseJson.springs) {