Merge pull request oVirt#597 from sjd78/startup-user-fix

For 'yarn start' use a different REST endpoint to reliably pull the user's UUID
sjd78 · May 14, 2018 · ffc5783 · ffc5783
2 parents 975cd4b + fe8257d
commit ffc5783
Showing 1 changed file with 22 additions and 39 deletions.
diff --git a/scripts/start.js b/scripts/start.js
@@ -25,19 +25,6 @@ var DEFAULT_PORT = process.env.PORT || 3000;
 var compiler;
 var handleCompile;
 
-// You can safely remove this after ejecting.
-// We only use this block for testing of Create React App itself:
-var isSmokeTest = process.argv.some(arg => arg.indexOf('--smoke-test') > -1);
-if (isSmokeTest) {
-  handleCompile = function (err, stats) {
-    if (err || stats.hasErrors() || stats.hasWarnings()) {
-      process.exit(1);
-    } else {
-      process.exit(0);
-    }
-  };
-}
-
 var isFirstClear = true;
 function clearConsole() {
   // On first run, clear completely so it doesn't show half screen on Windows.
@@ -311,6 +298,7 @@ function getUserInfo (protocol, port) {
   if (!engineUrl) {
     throw new Error('Please run script with the `ENGINE_URL` environment variable set.')
   }
+  engineUrl = engineUrl.replace(/\/$/, '')
   console.log(`Please authenticate against oVirt running at ${engineUrl}`);
 
   var DEFAULT_USER = 'admin@internal';
@@ -350,33 +338,28 @@ function getUserInfo (protocol, port) {
       if (err) {
         return reject(err)
       }
-      if (body['access_token']) {
-        const usersApiUrl = `${engineUrl}/api/users`
-        request(usersApiUrl, { json: true, strictSSL: false, headers: { Authorization: `Bearer ${body['access_token']}` } }, (userErr, userResponse, userBody) => {
-          // This request not always return current user data, it may be caused by server error, or current user isn't administrator and have no permissions for that
-          if (!userErr && userBody.user && userBody.user.length > 0 ) {
-            for (let i in userBody.user) {
-              if (userBody.user[i]['user_name'] === (username.slice(0, username.indexOf('@')) + '@' + domain)) {
-                resolve({
-                  userName: username.slice(0, username.indexOf('@')),
-                  ssoToken: body.access_token,
-                  domain: domain,
-                  userId: userBody.user[i].id,
+      if (body.access_token) {
+        const apiRootUrl = `${engineUrl}/api/`
+        request(apiRootUrl,
+                { json: true, strictSSL: false, headers: { Authorization: `Bearer ${body.access_token}` } }, 
+                (apiRootError, apiRootResponse, apiRootBody) => {
+                  let userId = undefined
+
+                  if (!apiRootError && apiRootBody.authenticated_user) {
+                    userId = apiRootBody.authenticated_user.id
+                  } else {
+                    userId = readlineSync.question(`oVirt user id (optional, it can be found at ${apiRootUrl}) : `, {
+                      defaultInput: null,
+                    })
+                  }
+
+                  resolve({
+                    userName: username.slice(0, username.indexOf('@')),
+                    ssoToken: body.access_token,
+                    domain,
+                    userId,
+                  })
                 })
-                return
-              }
-            }
-          }
-          var userId = readlineSync.question(`oVirt user id (optional, it can be found at ${usersApiUrl}) : `, {
-            defaultInput: null,
-          });            
-          resolve({
-            userName: username.slice(0, username.indexOf('@')),
-            ssoToken: body.access_token,
-            domain: domain,
-            userId: userId,
-          })
-        })
       } else {
         reject(JSON.stringify(body))
       }