Release 1.12.0 (#18)

TykTechnologies · Nov 13, 2024 · a3b52ef · a3b52ef
1 parent 5ae7ffa
commit a3b52ef
Show file tree

Hide file tree

Showing 13 changed files with 553 additions and 108 deletions.
diff --git a/src/assets/javascripts/components/interactive.js b/src/assets/javascripts/components/interactive.js
diff --git a/src/layouts/portal_layout.tmpl b/src/layouts/portal_layout.tmpl
@@ -23,7 +23,7 @@
       })(window,document,'script','dataLayer','GTM-NGN82WCD');</script>
     {{end}}
     <!-- End Google Tag Manager -->
-    <!-- stoplight.io -->    
+    <!-- stoplight.io -->
     <script>
       function loadFallbackScript(src) {
         let script = document.createElement('script');
@@ -35,6 +35,10 @@
     <script src="https://unpkg.com/@stoplight/elements/web-components.min.js" onerror="loadFallbackScript('/assets/vendor/stoplight/elements/web-components.min.js')" async></script>
     <link rel="preload" href="https://unpkg.com/@stoplight/elements/styles.min.css" as="style" onload="this.onload=null;this.rel='stylesheet'" onerror="this.onerror=null;this.href='/assets/vendor/stoplight/elements/styles.min.css'">
     <script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"> </script>
+
+	<script src="https://unpkg.com/@asyncapi/react-component@latest/browser/standalone/index.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/@asyncapi/react-component@latest/styles/default.min.css">
+
     <!-- Load style assets -->
     <link href="/assets/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
@@ -53,7 +57,7 @@
 
   <body {{if $isAuth}}style="margin-top:0;padding:0;"{{end}}>
       <!-- Render top navigation menu -->
-      
+
       {{if not $isAuth}}
         {{ render "top_nav" . }}
       {{end}}

diff --git a/src/layouts/product_layout_doc_asyncapi.tmpl b/src/layouts/product_layout_doc_asyncapi.tmpl
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <title>{{.product.Name}}: {{.api.Name}} Documentation</title>
+
+    <link href="/assets/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/assets/stylesheets/fonts.css" rel="stylesheet">
+    <link href="/assets/stylesheets/main.css" rel="stylesheet">
+
+    <!-- stoplight.io -->
+    <script src="https://unpkg.com/@asyncapi/react-component@latest/browser/standalone/index.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/@asyncapi/react-component@latest/styles/default.min.css">
+
+    <!-- <link rel="stylesheet" href=""> -->
+
+</head>
+<body>
+
+{{ render "top_nav" . }}
+<!-- Page Content -->
+    {{ yield }}
+{{ render "footer" . }}
+
+</body>
+</html>
diff --git a/src/mailers/keyexpired.html.tmpl b/src/mailers/keyexpired.html.tmpl
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Credential Expiring Soon</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            line-height: 1.6;
+            color: #333;
+            max-width: 600px;
+            margin: 0 auto;
+            padding: 20px;
+        }
+        .container {
+            background-color: #f9f9f9;
+            border-radius: 5px;
+            padding: 20px;
+        }
+        .header {
+            font-size: 24px;
+            color: #2c3e50;
+            margin-bottom: 20px;
+        }
+        .content {
+            margin-bottom: 20px;
+        }
+        .footer {
+            font-size: 14px;
+            color: #7f8c8d;
+            margin-top: 20px;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="header">
+            Credential Expired
+        </div>
+        <div class="content">
+            <p>Hi <strong>{{.user.First}}</strong>,</p>
+            <p>Your credential <strong>{{.credential.CredentialHash}}</strong> is expired.</p>
+        </div>
+        <div class="footer">
+            <p>Regards,</p>
+            <p>The Team</p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/src/mailers/keyexpired.text.tmpl b/src/mailers/keyexpired.text.tmpl
@@ -0,0 +1,7 @@
+Hi {{.user.First}},
+
+Your credential {{.credential.CredentialHash}} is expired. 
+
+Regards,
+
+The Team
diff --git a/src/mailers/keyexpired.tmpl b/src/mailers/keyexpired.tmpl
@@ -0,0 +1,7 @@
+Hi {{.user.First}},
+
+Your credential {{.credential.CredentialHash}} is expired. 
+
+Regards,
+
+The Team
diff --git a/src/mailers/keytoexpire.html.tmpl b/src/mailers/keytoexpire.html.tmpl
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Credential Expiring Soon</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            line-height: 1.6;
+            color: #333;
+            max-width: 600px;
+            margin: 0 auto;
+            padding: 20px;
+        }
+        .container {
+            background-color: #f9f9f9;
+            border-radius: 5px;
+            padding: 20px;
+        }
+        .header {
+            font-size: 24px;
+            color: #2c3e50;
+            margin-bottom: 20px;
+        }
+        .content {
+            margin-bottom: 20px;
+        }
+        .footer {
+            font-size: 14px;
+            color: #7f8c8d;
+            margin-top: 20px;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="header">
+            Credential Expiring Soon
+        </div>
+        <div class="content">
+            <p>Hi <strong>{{.user.First}}</strong>,</p>
+            <p>Your credential <strong>{{.credential.CredentialHash}}</strong> is expiring soon. Please log in to the developer portal to renew it.</p>
+        </div>
+        <div class="footer">
+            <p>Regards,</p>
+            <p>The Team</p>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/src/mailers/keytoexpire.text.tmpl b/src/mailers/keytoexpire.text.tmpl
@@ -0,0 +1,7 @@
+Hi {{.user.First}},
+
+Your credential {{.credential.CredentialHash}} is expiring soon, please log in to the developer portal to renew it.
+
+Regards,
+
+The Team
diff --git a/src/mailers/keytoexpire.tmpl b/src/mailers/keytoexpire.tmpl
@@ -0,0 +1,7 @@
+Hi {{.user.First}},
+
+Your credential {{.credential.CredentialHash}} is expiring soon, please log in to the developer portal to renew it.
+
+Regards,
+
+The Team
diff --git a/src/views/app_form_update.tmpl b/src/views/app_form_update.tmpl
@@ -134,6 +134,52 @@
                 </div>
               {{end}}
               {{ range $app.Credentials }}
+                {{ if eq .CredentialType "CREDENTIAL_TYPE_CUSTOM" }}
+                  <div class="card p-0 mb-4">
+                    <div class="card-body d-flex flex-row justify-content-between flex-wrap">
+                      <div class="row">
+                      <div class="col-lg-12 requests-row-section">
+                        <div class="d-flex flex-row justify-content-between align-items-center flex-wrap p-3">
+                            <h3 class="m-0">Access and Credentials info</h3>
+                          </div>
+                        </div>
+                      </div>
+                       <div class="col-lg-12 requests-row-section">
+                        <div class="d-flex flex-row justify-content-between align-items-center flex-wrap p-3 requests-row-section__info">
+                          <div class="d-flex flex-column pr-3">
+                            <strong class="mr-4 text-uppercase mb-1">Key</strong>
+                            <span>A unique ID used to identify the application.</span>
+                          </div>
+                          <div class="d-flex flex-row justify-content-around">
+                            <input type="password" class="input-as-span content-field" value="{{.CredentialKey}}" disabled>
+                            <i class="tyk-icon tykon tykon-copy" data-copy-value="{{.CredentialKey}}"></i>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="col-lg-12 requests-row-section">
+                        <div class="d-flex flex-row justify-content-between align-items-center flex-wrap p-3 requests-row-section__info">
+                          <div class="d-flex flex-column pr-3">
+                            <strong class="mr-4 text-uppercase mb-1">Secret</strong>
+                            <span>This is the unique password for the app and auth server, do not share this information.</span>
+                          </div>
+                          <div class="d-flex flex-row justify-content-around">
+                            <input type="password" class="input-as-span content-field" value="{{.CredentialSecret}}" disabled>
+                            <i class="tyk-icon tykon tykon-copy" data-copy-value="{{.CredentialSecret}}"></i>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="col-lg-12 requests-row-section">
+                        <div class="d-flex flex-row justify-content-between align-items-center flex-wrap p-3 requests-row-section__info">
+                          <div class="d-flex flex-column pr-3">
+                            <strong class="mr-4 text-uppercase">Expires:</strong>
+                          </div>
+                          <div>
+                            {{ .ExpiresAsString }}
+                          </div>
+                        </div>
+                    </div>
+                  </div>
+                {{ else }} 
                 <div class="card p-0 mb-4">
                   <div class="card-body d-flex flex-row justify-content-between flex-wrap">
                     <div class="row">
@@ -205,7 +251,7 @@
                             <span>A unique ID used to identify the application.</span>
                           </div>
                           <div class="d-flex flex-row justify-content-around">
-                            <input type="password" class="input-as-span content-field" value="{{ if .Credential }}{{.Credential}}{{else}}{{.OAuthClientID}}{{end}}" disabled>
+                            <input type="password" class="input-as-span content-field" value="{{if .CustomKeyID}}{{.CustomKeyID}}{{ else if .Credential }}{{.Credential}}{{else}}{{.OAuthClientID}}{{end}}" disabled>
                             <i class="tyk-icon tykon tykon-copy" data-copy-value="{{ if .Credential }}{{.Credential}}{{else}}{{.OAuthClientID}}{{end}}"></i>
                           </div>
                         </div>
@@ -522,6 +568,7 @@
                   </div>
                   </div>
                 </form>
+                {{end}}
               {{end}}
             </div>
             <div class="tab-pane fade {{ if not $hasApproved }}show active{{end}}" id="pending" role="tabpanel" aria-labelledby="pending-tab">