modify check token logic

shadim · shadim · commit 030ffb546ff9 · 2018-11-26T05:13:50.000-08:00
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg001EmbeddedSigningController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg001EmbeddedSigningController.cs
@@ -29,6 +29,17 @@ public Eg001EmbeddedSigningController(DSConfiguration config, IRequestItemsServi
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {                
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             // Step 1. Create the envelope definition
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg002SigningViaEmailController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg002SigningViaEmailController.cs
@@ -26,6 +26,17 @@ public Eg002SigningViaEmailController(DSConfiguration config, IRequestItemsServi
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             EnvelopeDefinition env = MakeEnvelope(signerEmail, signerName, ccEmail, ccName);
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg003ListEnvelopesController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg003ListEnvelopesController.cs
@@ -26,6 +26,17 @@ public Eg003ListEnvelopesController(DSConfiguration config, IRequestItemsService
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg004EnvelopeInfoController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg004EnvelopeInfoController.cs
@@ -24,6 +24,17 @@ public Eg004EnvelopeInfoController(DSConfiguration config, IRequestItemsService
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg005EnvelopeRecipientsController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg005EnvelopeRecipientsController.cs
@@ -20,6 +20,17 @@ public Eg005EnvelopeRecipientsController(DSConfiguration config, IRequestItemsSe
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg006EnvelopeDocsController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg006EnvelopeDocsController.cs
@@ -22,6 +22,17 @@ public Eg006EnvelopeDocsController(DSConfiguration config, IRequestItemsService
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg007EnvelopeGetDocController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg007EnvelopeGetDocController.cs
@@ -18,8 +18,19 @@ public Eg007EnvelopeGetDocController(DSConfiguration config, IRequestItemsServic
         public override string EgName => "eg007";
 
         [HttpPost]
-        public FileResult Create(string docSelect)
+        public ActionResult Create(string docSelect)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg008CreateTemplateController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg008CreateTemplateController.cs
@@ -21,7 +21,18 @@ public Eg008CreateTemplateController(DSConfiguration config, IRequestItemsServic
 
         [HttpPost]
         public IActionResult Create()
-        {           
+        {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             string templateName = "Example Signer and CC template";
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg009UseTemplateController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg009UseTemplateController.cs
@@ -23,6 +23,17 @@ public Eg009UseTemplateController(DSConfiguration config, IRequestItemsService r
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg010SendBinaryDocsController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg010SendBinaryDocsController.cs
@@ -26,6 +26,17 @@ public Eg010SendBinaryDocsController(DSConfiguration config, IRequestItemsServic
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             // Step 1. Make the envelope JSON request body
             dynamic envelope = MakeEnvelope(signerEmail, signerName, ccEmail, ccName);
 
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg011EmbeddedSendingController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg011EmbeddedSendingController.cs
@@ -26,6 +26,17 @@ public Eg011EmbeddedSendingController(DSConfiguration config, IRequestItemsServi
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName, string startingView)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg012EmbeddedConsoleController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg012EmbeddedConsoleController.cs
@@ -23,6 +23,17 @@ public Eg012EmbeddedConsoleController(DSConfiguration config, IRequestItemsServi
         [HttpPost]
         public IActionResult Create(string startingView)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg013AddDocToTemplateController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg013AddDocToTemplateController.cs
@@ -26,6 +26,17 @@ public Eg013AddDocToTemplateController(DSConfiguration config, IRequestItemsServ
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName, string item, string quantity)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg014CollectPaymentController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg014CollectPaymentController.cs
@@ -25,6 +25,17 @@ public Eg014CollectPaymentController(DSConfiguration config, IRequestItemsServic
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName)
         {
+            bool tokenOk = CheckToken(3);
+            if (!tokenOk)
+            {
+                // We could store the parameters of the requested operation 
+                // so it could be restarted automatically.
+                // But since it should be rare to have a token issue here,
+                // we'll make the user re-enter the form data after 
+                // authentication.
+                RequestItemsService.EgName = EgName;
+                return Redirect("/ds/mustAuthenticate");
+            }
             var session = RequestItemsService.Session;
             var user = RequestItemsService.User;
             var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/EgController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/EgController.cs
@@ -1,5 +1,6 @@
 ﻿using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
+using System;
 
 namespace eg_03_csharp_auth_code_grant_core.Controllers
 {
@@ -23,7 +24,7 @@ public IActionResult Get()
             // to have the user authenticate or re-authenticate.
             bool tokenOk = CheckToken();
 
-            ViewBag.showDoc = true;
+            
             if (tokenOk)
             {               
                 //addSpecialAttributes(model);
@@ -51,10 +52,11 @@ private dynamic CreateSourcePath()
             return Config.githubExampleUrl + source + ".cs";
         }
 
-        private bool CheckToken()
-        {
-            //TODO: add token expiration time validation check like node program
-            return HttpContext.User.Identity.IsAuthenticated;
+        protected bool CheckToken(int bufferMin = 60)
+        {            
+            return HttpContext.User.Identity.IsAuthenticated 
+                && (DateTime.Now.Subtract(TimeSpan.FromMinutes(bufferMin)) <
+                RequestItemsService.User.ExpireIn.Value);
         }
     }
 }
