Merge branch 'main' into solution-boms

Author: NoeSamaille

README.md

@@ -1,6 +1,6 @@
 # Ascent UI
 
-This repository contains the Front-End microservice of the Ascent tool.
+This repository contains the Front-End microservice of the Ascent tool (TechZone Deployer - Builder).
 
 Ascent is a tool created by the IBM Ecosystem Engineering team to accelerate the adoption of IBM Software on Hybrid Cloud. Through automation and integration, Ascent enables enterprises to deliver compliant cloud architectures which can be clearly evidenced and communicated with Governance, Risk and Compliance teams.
 

server/server.js

@@ -176,14 +176,12 @@ const config = require('../config/config');
 
 
   app.use('/api/token', (req, res, next) => {
-    if (  req.isAuthenticated() &&
-        ((config.authProvider === "appid" && AuthStrategy.hasScope(req, "super_edit"))
-        || (config.authProvider === "openshift" && req.user.groups.includes("ascent-admins"))))
+    if ( req.isAuthenticated() )
     {
       if (config.authProvider === "openshift") {
         res.json({token: Buffer.from(`${req.user.token}`).toString('base64')});
       } else {
-        res.json({token: Buffer.from(`${req.session[AuthStrategy.AUTH_CONTEXT].accessToken} ${req.session[AuthStrategy.AUTH_CONTEXT].identityToken}`).toString('base64')});
+        res.json({token: Buffer.from(req.session[AuthStrategy.AUTH_CONTEXT].refreshToken).toString('base64')});
       }
       return next();
     } else {

src/components/ui-shell/UIShell.jsx

@@ -189,7 +189,7 @@ class UIShell extends Component {
                   <strong>region:</strong>
                   <Tag style={{ marginLeft: '.5rem' }}>{this.state.user?.region}</Tag>
                 </li> : <></>}
-                {ApplicationMode.isBuilderMode()  && this.state.user?.role === 'admin' ? <div>
+                {ApplicationMode.isBuilderMode() ? <div>
                   <SwitcherDivider />
                   <SwitcherItem aria-label="API token" onClick={this.fetchToken.bind(this)}>
                     <span>API token</span>{this.state.copyTokenIcon}