Merge pull request #3 from tlgman/feat-change-pis-and-ais-forms

fintecturegit · web-flow · commit 53feb90d1584 · 2022-01-20T21:31:40.000+01:00
Feat change pis and ais forms
diff --git a/ais-connect.js b/ais-connect.js
@@ -12,6 +12,7 @@ dotenv.config({ path: path.join(__dirname, '.env') });
 
 require('dotenv').config();
 
+
 // Create the fintecture client instance
 let client = new FintectureClient({ app_id: process.env.APP_ID, app_secret: process.env.APP_SECRET, private_key: process.env.APP_PRIV_KEY, env: process.env.FINTECTURE_ENV });
 
@@ -22,29 +23,35 @@ let customerId;
 
 // initial screen
 app.get("/", async (_req, res) => {
-    res.render("index", {});
+    res.render('index', {
+        country: 'fr'
+    });
 });
 
 
 // Redirect to connect
-app.get("/connect", async (req, res) => {
+app.get("/connect", async (req, res, next) => {
     const psuType = req.query.psu_type || 'all';
     const country = req.query.country || 'fr';
 
-    let config = {
+    const config = {
         redirect_uri: process.env.APP_REDIRECT_URI,
         state: "bob",
         psu_type: psuType,
         country: country
-    }
-
-    const connect = await client.getAisConnect(null, config)
+    };
 
-    res.writeHead(
-        301,
-        { Location: connect.url }
-    );
-    res.end();
+    try {
+        const connect = await client.getAisConnect(null, config);
+
+        res.writeHead(
+            301,
+            { Location: connect.url }
+        );
+        res.end();
+    } catch(err) {
+        next(err);
+    }
 });
 
 app.get("/error_page", async (req, res) => {
diff --git a/package.json b/package.json
@@ -4,7 +4,10 @@
   "description": "",
   "main": "sample.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start:ais-connect": "node ais-connect",
+    "start:ais-decoupled": "node ais-decoupled",
+    "start:ais-redirect": "node ais-redirect",
+    "start:pis-connect": "node pis-connect"
   },
   "author": "",
   "license": "ISC",
diff --git a/pis-connect.js b/pis-connect.js
@@ -38,7 +38,8 @@ app.get("/", async (_req, res) => {
         customer_address_country: '',
         production: process.env.FINTECTURE_ENV === "production",
         scheme: 'auto',
-        country: 'fr'
+        country: 'fr',
+        expiry: undefined
     });
 });
 
@@ -68,6 +69,8 @@ app.post("/connect", async (req, res) => {
             psu_type: req.body.psu_type || 'retail',
             country: req.body.country || 'fr',
             scheme: (req.body.scheme == "auto")?'':req.body.scheme,
+            expiry: req.body.expiry,
+            scheduled_expiration_policy: req.body.scheduled_expiration_policy
         };
 
         try {
diff --git a/views/ais-connect/index.ejs b/views/ais-connect/index.ejs
@@ -1,14 +1,26 @@
 <html>
     <body>
         <form name="form1" method="GET" action="/connect">
+            <div class="form-group">
+                <label for="country">Country</label>
+                <input type="text" name="country" value="<%= country %>">
+            </div>
             <input type="hidden" name="psu_type" value="all" /> 
             <button type="submit">Connect ALL</button>
         </form>
         <form name="form1" method="GET" action="/connect">
+            <div class="form-group">
+                <label for="country">Country</label>
+                <input type="text" name="country" value="<%= country %>">
+            </div>
             <input type="hidden" name="psu_type" value="retail" /> 
             <button type="submit">Connect RETAIL</button>
         </form>
         <form name="form1" method="GET" action="/connect">
+            <div class="form-group">
+                <label for="country">Country</label>
+                <input type="text" name="country" value="<%= country %>">
+            </div>
             <input type="hidden" name="psu_type" value="corporate" /> 
             <button type="submit">Connect CORPO</button>
         </form>
diff --git a/views/pis-connect-qr/index.ejs b/views/pis-connect-qr/index.ejs
@@ -23,7 +23,7 @@
                 <input type="text" id="communication" name="communication" value="<%= communication %>">
             </div>
             <div class="form-group">
-                <label for="psu_type">* Type</label>
+                <label for="psu_type">* Psu Type</label>
                 <select name="psu_type">
                     <option value="retail">Retail</option>
                     <option value="corporate">Corporate</option>
diff --git a/views/pis-connect/index.ejs b/views/pis-connect/index.ejs
@@ -28,15 +28,15 @@
             <input type="text" id="execution_date" name="execution_date" value="<%= execution_date %>">
         </div>
         <div class="form-group">
-            <label for="psu_type">* Type</label>
+            <label for="psu_type">* Psu Type</label>
             <select name="psu_type">
                 <option value="all">All</option>
                 <option value="retail">Retail</option>
                 <option value="corporate">Corporate</option>
             </select>
         </div>
         <div class="form-group">
-            <label for="Scheme">* Type</label>
+            <label for="Scheme">* Scheme</label>
             <select name="scheme">
                 <option value="auto">Auto</option>
                 <option value="SEPA">SEPA</option>
@@ -87,6 +87,18 @@
             <label for="customer_address_country">Customer Address Country</label>
             <input type="email" id="customer_address_country" name="customer_address_country" value="<%= customer_address_country %>">
         </div>
+        <div class="form-group">
+            <label for="expiry">Expiry</label>
+            <input type="number" id="expiry" name="expiry" value="<%= expiry %>" min="0" step="1000">
+        </div>
+        <div class="form-group">
+            <label for="scheduled_expiration_policy">Scheduled Expiration Policy</label>
+            <select id="scheduled_expiration_policy" name="scheduled_expiration_policy">
+                <option  disabled selected value>No value</option>
+                <option value="immediate">immediate</option>
+                <option value="expire">expire</option>
+            </select>
+        </div>
 
         <button type="submit">Pay by bank</button>
     </form>
