Merge pull request #103 from topcoder-platform/hotfix/new-auth

Master (HotFix): new auth changes - 29 Oct 2020

Author: Gunasekar-K

conf/OnlineReview.xml

@@ -5311,6 +5311,11 @@
                 <Value>@aws_s3_bucket_dmz@</Value>
             </Property>
         </Property>
+        <Property name="new_auth">
+            <Property name="new_auth_url">
+                <Value>@new_auth_url@</Value>
+            </Property>
+        </Property>
     </Config>
 
     <!--

src/java/main/com/cronos/onlinereview/util/ConfigHelper.java

@@ -1070,6 +1070,11 @@ public class ConfigHelper {
      * JWT default expiration time (1 day)
      */
     private static final int DEFAULT_EXPIRATION_TIME = 60 * 24;
+    
+    /**
+     * New Auth URL for Iframe to refresh the RS256 token
+     */
+    private static String newAuthUrl;
 
     static {
         // Obtaining the instance of Configuration Manager
@@ -1698,6 +1703,10 @@ public class ConfigHelper {
             } catch (Exception e) {
                 preSignedExpTimeMilis = 60 * 60 * 1000;
             }
+	    
+            Property newAuth = cfgMgr.getPropertyObject(ONLINE_REVIEW_CFG_NS, "new_auth");
+            newAuthUrl = newAuth.getValue("new_auth_url");
+
         } catch (UnknownNamespaceException une) {
             System.out.println(une.getMessage());
             une.printStackTrace();
@@ -2657,4 +2666,12 @@ public static String getS3BucketDmz() {
     public static long getPreSignedExpTimeMilis() {
         return preSignedExpTimeMilis;
     }
+    
+    /**
+     * Get new auth url 
+     * @return url 
+     */
+    public static String getNewAuthUrl() {
+        return newAuthUrl;
+    }
 }

web/includes/inc_footer.jsp

@@ -50,3 +50,14 @@ analytics.identify('', {
 });
 </script>
 
+<script>
+function prepareFrame() {
+	var ifrm = document.createElement("iframe");
+	ifrm.setAttribute("src", "<%=com.cronos.onlinereview.util.ConfigHelper.getNewAuthUrl()%>");
+	ifrm.style.width = "0px";
+	ifrm.style.height = "0px";
+	document.body.appendChild(ifrm);
+}
+window.onload = prepareFrame;
+</script>
+

web/includes/inc_header.jsp

@@ -54,7 +54,7 @@
             </script>    
 
             <a href="javascript:;" class="social-login">Social login</a>
-             | <a href="http://<%=ApplicationServer.SERVER_NAME%>/login/?next=https://<%=ApplicationServer.SOFTWARE_SERVER_NAME%>/review">Login</a>
+             | <a href="http://<%=com.cronos.onlinereview.util.ConfigHelper.getNewAuthUrl()%>?retUrl=https://<%=ApplicationServer.SOFTWARE_SERVER_NAME%>/review">Login</a>
              | <a href="http://<%=ApplicationServer.SERVER_NAME%>/reg/">Register</a>
              | <a href="http://<%=ApplicationServer.SERVER_NAME%>/">Home</a>
         </c:if>