Merge pull request #7 from Identicum/refresh-token-error. closes #6

FIX Null Refresh Token Handling

Author: ggallard

conf/info.conf

@@ -10,17 +10,17 @@ content_by_lua_block {
 	local access_token = ipax.get_access_token();
 	ngx.log(ngx.DEBUG, "access_token: " .. access_token)
 	local refresh_token = ipax.get_refresh_token();
-	ngx.log(ngx.DEBUG, "refresh_token: " .. refresh_token)
+	ngx.log(ngx.DEBUG, "refresh_token: " .. tostring(refresh_token))
 
 
 	local data = {
 		user = ipax.get_user(),
 		headers = ngx.resp.get_headers(),
 		access_token = access_token,
-		refresh_token = refresh_token,
+		refresh_token = refresh_token or "Not Provided in token endpoint response",
 		id_token = id_token,
 		userinfo_json = ipax.get_userinfo_json(),
-		username = ipax.get_preferred_username_from_userinfo_or_idtoken(),
+		username = ipax.get_preferred_username_from_userinfo_or_idtoken() or "Not Informed",
 		user_actions = ipax.get_user_actions(),
 		logout_uri = os.getenv("OIDC_LOGOUT_URI"),
 		app_name = os.getenv("IPAX_APP_NAME")

lua/ipax.lua

@@ -234,14 +234,15 @@ function _M.get_preferred_name_from_userinfo()
 end
 
 function _M.get_preferred_username_from_userinfo_or_idtoken()
-    local id_token = _M.get_id_token() 
-    local preferred_username = id_token.preferred_username
+    local userinfo_preferred_username = _M.get_preferred_name_from_userinfo()
 
-	if preferred_username == nil then
-		return _M.get_preferred_name_from_userinfo()
+	if userinfo_preferred_username == nil then
+		local id_token = _M.get_id_token() 
+    	return id_token.preferred_username
     else
-		return preferred_username
+		return userinfo_preferred_username
     end
+
 end
 
 function _M.get_id_token()
@@ -256,7 +257,8 @@ end
 
 function _M.get_refresh_token()
 	local res = _M.get_res()
-	return res.refresh_token
+	local refresh_token = res.refresh_token or nil
+	return refresh_token
 end
 
 function _M.get_res()

templates/info.html

@@ -156,7 +156,7 @@
                                 </thead>
                                 <tbody>
                                     <tr><td style='word-break:break-word;white-space:pre-wrap;-moz-white-space:pre-wrap;'>{{access_token}}</td></tr>
-                                    <tr id="secondRow"><td>View in <a href='https://jwt.io/?value={{access_token}}' target='_blank'>https://jwt.io/</a></td></tr>
+                                    <tr id="accessTokenSecondRow"><td>View in <a href='https://jwt.io/?value={{access_token}}' target='_blank'>https://jwt.io/</a></td></tr>
                                 </tbody>
                             </table>
                         </div>
@@ -169,7 +169,7 @@
                                 </thead>
                                 <tbody>
                                     <tr><td style='word-break:break-word;white-space:pre-wrap;-moz-white-space:pre-wrap;'>{{refresh_token}}</td></tr>
-                                    <tr id="secondRow"><td>View in <a href='https://jwt.io/?value={{refresh_token}}' target='_blank'>https://jwt.io/</a></td></tr>
+                                    <tr id="refreshTokenSecondRow"><td>View in <a href='https://jwt.io/?value={{refresh_token}}' target='_blank'>https://jwt.io/</a></td></tr>
                                 </tbody>
                             </table>
                         </div>
@@ -236,7 +236,13 @@
             const accessToken = "{{access_token}}";
 
             if (!accessToken.startsWith("ey")) {
-                document.getElementById("secondRow").style.display = "none";
+                document.getElementById("accessTokenSecondRow").style.display = "none";
+            }
+
+            const refreshToken = "{{refresh_token}}";
+
+            if (refreshToken === "Not Provided in token endpoint response") {
+                document.getElementById("refreshTokenSecondRow").style.display = "none";
             }
         </script>
     </body>