[webportal] Redirect to the source page after login. (#3914)

src/rest-server/src/controllers/v2/azureAD.js

@@ -32,9 +32,13 @@ const requestAuthCode = async (req, res, next) => {
   if (authnConfig.groupConfig.groupDataSource === 'ms-graph') {
     scope = `${scope} https://${authnConfig.OIDCConfig.msgraph_host}/directory.read.all`;
   }
-  let state = 'http://' + process.env.WEBPORTAL_URL + '/index.html';
+  let state = {};
+  state.redirect = 'http://' + process.env.WEBPORTAL_URL + '/index.html';
   if (req.query.redirect_uri) {
-    state = decodeURIComponent(req.query.redirect_uri);
+    state.redirect = req.query.redirect_uri;
+  }
+  if (req.query.from) {
+    state.from = req.query.from;
   }
   const requestURL = authnConfig.OIDCConfig.authorization_endpoint;
   return res.redirect(`${requestURL}?`+ querystring.stringify({
@@ -43,7 +47,7 @@ const requestAuthCode = async (req, res, next) => {
     redirect_uri: redirectUri,
     response_mode: responseMode,
     scope: scope,
-    state: state,
+    state: JSON.stringify(state),
   }));
 };
 
@@ -74,7 +78,9 @@ const requestTokenWithCode = async (req, res, next) => {
     req.accessToken = jwt.decode(response.data.access_token);
     req.undecodedRefreshToken = response.data.refresh_token;
     req.refreshToken = jwt.decode(response.data.refresh_token);
-    req.returnBackURI = req.body.state;
+    const state = JSON.parse(req.body.state);
+    req.returnBackURI = state.redirect;
+    req.fromURI = state.from;
     next();
   } catch (error) {
     return next(createError.unknown(error));

src/rest-server/src/controllers/v2/token.js

@@ -64,11 +64,13 @@ const getAAD = async (req, res, next) => {
     const userInfo = await userModel.getUser(username);
     const admin = await userModel.checkAdmin(username);
     const token = await tokenModel.create(username);
+    const fromURI = req.fromURI;
     return res.redirect(req.returnBackURI + '?'+ querystring.stringify({
       user: userInfo.username,
       token: token,
       admin: admin,
       hasGitHubPAT: userInfo.extension.githubPAT,
+      from: fromURI,
     }));
   } catch (error) {
     return next(createError.unknown(error));

src/webportal/src/app/home/index.jsx

@@ -87,7 +87,7 @@ const Index = () => {
         config.restServerUri +
         `/api/v1/authn/oidc/login?${querystring.stringify({
           redirect_uri: new URL('/index.html', window.location.href).href,
-          callback: window.location.href,
+          from: new URL(loginTarget, window.location.href).href,
         })}`;
     }
   }, []);