fix xapi js from simva received data

Author: jujusb

src/lib/xapi.js

@@ -2,46 +2,59 @@ const xAPIConfig = {
     "grant_type": "password"
 }
 const urlParams = new URLSearchParams(window.location.search);
-var simvaResultUri, simvaBackupUri, authToken, username, userToken, token_endpoint, client_id, login_hint, homepage,debug, batchLength, batchTimeoutInSec, maxRetryDelayInSec;
+var result_uri,backup_uri, backup_type, actor_username, actor_homepage, debug, batchLength, batchTimeoutInSec, maxRetryDelayInSec
 if(urlParams.size > 0) {
-    simvaResultUri = urlParams.get('url');
-    simvaBackupUri=simvaResultUri + "/result";
-    var token = urlParams.get('authToken');
-    if(token) {
-        authToken = "Bearer " + token;
-    } else {
-        authToken = null;
+    //RESULT URI
+    result_uri = urlParams.get('result_uri');
+    //BACKUP URI
+    backup_uri=urlParams.get('backup_uri');
+    backup_type=urlParams.get('backup_type');
+
+    //ACTOR DATA
+    actor_homepage = urlParams.get('actor_homepage');
+    actor_username = urlParams.get('actor_user');
+    
+    //SSO DATA
+    const sso_token_endpoint = urlParams.get('sso_token_endpoint');
+    if(sso_token_endpoint) {
+        xAPIConfig.token_endpoint=sso_token_endpoint;
+    }
+    const sso_client_id = urlParams.get('sso_client_id');
+    if(sso_client_id) {
+        xAPIConfig.client_id=sso_client_id;
     }
-    username = urlParams.get('username');
-    token_endpoint = urlParams.get('token_endpoint');
-    if(token_endpoint) {
-        xAPIConfig.token_endpoint=token_endpoint;
+    const sso_login_hint = urlParams.get('sso_login_hint');
+    if(sso_login_hint) {
+        xAPIConfig.login_hint=sso_login_hint;
     }
-    client_id = urlParams.get('client_id');
-    if(client_id) {
-        xAPIConfig.client_id=client_id;
+    const sso_grant_type = urlParams.get('sso_grant_type');
+    if(sso_grant_type) {
+        xAPIConfig.grant_type=sso_grant_type;
     }
-    userToken = urlParams.get('usertoken');
-    if(userToken) {
-        xAPIConfig.username=userToken;
-        xAPIConfig.password=userToken;
+    const sso_username = urlParams.get('sso_username');
+    if(sso_username) {
+        xAPIConfig.username=sso_username;
     }
-    login_hint = urlParams.get('login_hint');
-    if(login_hint) {
-        xAPIConfig.login_hint=login_hint;
+    const sso_password = urlParams.get('sso_password');
+    if(sso_password) {
+        xAPIConfig.password=sso_password;
+    } else {
+        if(sso_username) {
+            xAPIConfig.password=sso_username;
+        }
     }
-    homepage = urlParams.get('homepage');
+    
     debug=urlParams.get('debug');
     batchLength=urlParams.get('batchLength');
     batchTimeoutInSec=urlParams.get('batchTimeoutInSec');
     maxRetryDelayInSec=urlParams.get('maxRetryDelayInSec');
     if(debug !== null && debug == "true") {
         debug = Boolean(debug);
-        console.debug(simvaBackupUri);
-        console.debug(simvaResultUri);
-        console.debug(authToken);
-        console.debug(username);
-        console.debug(homepage);
+        console.debug(result_uri);
+        console.debug(backup_uri);
+        console.debug(backup_type);
+        console.debug(actor_username);
+        console.debug(actor_homepage);
         console.debug(debug);
         console.debug(batchLength);
         console.debug(batchTimeoutInSec);
@@ -56,8 +69,8 @@ if(urlParams.size > 0) {
     homepage = null;
     debug = false;
 }
-export var xapiTracker = new xAPITrackerAsset(simvaResultUri, simvaBackupUri, "XAPI", username, authToken, homepage, "ConectadoWeb", debug, batchLength, batchTimeoutInSec, maxRetryDelayInSec);
-//export var xapiTracker = new xAPITrackerAssetOAuth2(simvaResultUri, simvaBackupUri, "XAPI", username, xAPIConfig, homepage, "ConectadoWeb", debug, batchLength, batchTimeoutInSec, maxRetryDelayInSec);
+//export var xapiTracker = new xAPITrackerAsset(simvaResultUri, simvaBackupUri, "XAPI", username, authToken, homepage, "ConectadoWeb", debug, batchLength, batchTimeoutInSec, maxRetryDelayInSec);
+export var xapiTracker = new xAPITrackerAssetOAuth2(result_uri, backup_uri, backup_type, actor_username, xAPIConfig, actor_homepage, "ConectadoWeb", debug, batchLength, batchTimeoutInSec, maxRetryDelayInSec);
 export var accessibleXapiTracker = new AccessibleTracker(xapiTracker);
 export var alternativeXapiTracker = new AlternativeTracker(xapiTracker);
 export var completableXapiTracker = new CompletableTracker(xapiTracker);