Add stripe portal button on payment page

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -1513,10 +1513,12 @@ export class Message {
         let user: NoderedUser;
         const span: Span = Logger.otel.startSubSpan("message._EnsureNoderedInstance", parent);
         try {
-            Logger.instanse.debug("[" + cli.user.username + "] EnsureNoderedInstance");
+            // Logger.instanse.debug("[" + cli.user.username + "] EnsureNoderedInstance");
             if (_id === null || _id === undefined || _id === "") _id = cli.user._id;
             const name = await this.GetInstanceName(_id, cli.user._id, cli.user.username, cli.jwt, span);
 
+            Logger.instanse.debug("[" + cli.user.username + "] EnsureNoderedInstance for " + name + " in namespace " + Config.namespace);
+
             const users = await Config.db.query<NoderedUser>({ _id: _id }, null, 1, 0, null, "users", cli.jwt, undefined, undefined, span);
             if (users.length == 0) {
                 throw new Error("Unknown userid " + _id);
@@ -1858,7 +1860,12 @@ export class Message {
     private async _DeleteNoderedInstance(_id: string, myuserid: string, myusername: string, jwt: string, parent: Span): Promise<void> {
         const span: Span = Logger.otel.startSubSpan("message._DeleteNoderedInstance", parent);
         try {
+
+            if (_id === null || _id === undefined || _id === "") _id = myuserid;
             const name = await this.GetInstanceName(_id, myuserid, myusername, jwt, span);
+
+
+            // const name = await this.GetInstanceName(_id, myuserid, myusername, jwt, span);
             const user = Crypt.verityToken(jwt);
             const namespace = Config.namespace;
             let nodered_domain_schema = Config.nodered_domain_schema;
@@ -1867,7 +1874,6 @@ export class Message {
             }
             const hostname = nodered_domain_schema.replace("$nodered_id$", name);
 
-
             const deployment = await KubeUtil.instance().GetDeployment(namespace, name);
             if (deployment != null) {
                 let image: string = "unknown";
@@ -1883,14 +1889,20 @@ export class Message {
                     Audit.NoderedAction(user, false, name, "deletedeployment", image, null, span);
                     throw error;
                 }
+            } else {
+                Logger.instanse.warn("_DeleteNoderedInstance: Did not find deployment for " + name + " in namespace " + namespace);
             }
             const service = await KubeUtil.instance().GetService(namespace, name);
             if (service != null) {
                 await KubeUtil.instance().CoreV1Api.deleteNamespacedService(name, namespace);
+            } else {
+                Logger.instanse.warn("_DeleteNoderedInstance: Did not find service for " + name + " in namespace " + namespace);
             }
             const replicaset = await KubeUtil.instance().GetReplicaset(namespace, "app", name);
             if (replicaset !== null) {
                 KubeUtil.instance().AppsV1Api.deleteNamespacedReplicaSet(replicaset.metadata.name, namespace);
+            } else {
+                Logger.instanse.warn("_DeleteNoderedInstance: Did not find replicaset for " + name + " in namespace " + namespace);
             }
             const ingress = await KubeUtil.instance().GetIngressV1beta1(namespace, "useringress");
             if (ingress !== null) {
@@ -1904,6 +1916,8 @@ export class Message {
                 if (updated) {
                     delete ingress.metadata.creationTimestamp;
                     await KubeUtil.instance().ExtensionsV1beta1Api.replaceNamespacedIngress("useringress", namespace, ingress);
+                } else {
+                    Logger.instanse.warn("_DeleteNoderedInstance: Did not find ingress entry for " + name + " in namespace " + namespace);
                 }
             } else {
                 throw new Error("failed locating useringress");
@@ -3284,7 +3298,9 @@ export class Message {
             if (NoderedUtil.IsNullEmpty(msg.object)) throw new Error("object is mandatory");
             if (!cli.user.HasRoleName("admins")) {
                 if (!NoderedUtil.IsNullEmpty(msg.url)) throw new Error("Custom url not allowed");
-                if (msg.object != "plans" && msg.object != "subscription_items" && msg.object != "invoices_upcoming") throw new Error("Access to " + msg.object + " is not allowed");
+                if (msg.object != "plans" && msg.object != "subscription_items" && msg.object != "invoices_upcoming" && msg.object != "billing_portal/sessions") {
+                    throw new Error("Access to " + msg.object + " is not allowed");
+                }
 
                 if (msg.object == "subscription_items" && msg.method != "POST") throw new Error("Access to " + msg.object + " is not allowed");
                 if (msg.object == "plans" && msg.method != "GET") throw new Error("Access to " + msg.object + " is not allowed");

OpenFlow/src/public/Controllers.ts

@@ -3723,6 +3723,22 @@ export class PaymentCtrl extends entityCtrl<Billing> {
         }
         if (!this.$scope.$$phase) { this.$scope.$apply(); }
     }
+    async OpenPortal() {
+        try {
+            var payload: stripe_base = {} as any;
+            (payload as any).customer = this.stripe_customer.id;
+            var session: any = await NoderedUtil.Stripe("POST", "billing_portal/sessions", null, null, payload, null);
+            if (session && session.url) {
+                window.open(session.url, '_blank');
+                // window.location.href = session.url;
+            } else {
+                this.cardmessage = "Failed getting portal session url";
+            }
+        } catch (error) {
+            console.error(error);
+            this.cardmessage = error;
+        }
+    }
     async CheckOut(planid: string, subplanid: string) {
         try {
             const result = await NoderedUtil.StripeAddPlan(this.userid, planid, subplanid, null);

OpenFlow/src/public/Payment.html

@@ -344,9 +344,12 @@
         </div>
         <!-- ng-hide="ctrl.hastaxinfo && ctrl.hascustomer && (ctrl.model.coupon==null || ctrl.model.coupon == "")" -->
         <div class="form-group">
+            <label class="control-label" translate lib="web" ng-hide="!ctrl.hastaxinfo">Update / Manage</label>
             <div class="col-sm-offset-3 col-sm-9">
                 <button type="button" ng-click="ctrl.Save()" ng-disabled="ctrl.loading==true" class="btn btn-success"
                     translate lib="web">save</button>
+                <button type="button" ng-click="ctrl.OpenPortal()" ng-disabled="ctrl.loading==true"
+                    class="btn btn-success" translate lib="web">Portal</button>
             </div>
         </div>
         <!-- If you are based in Denmark, or you are based in an EU country and do not have a valid VAT number, you will be

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.2.107",
+  "version": "1.2.108",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

VERSION

@@ -1 +1 @@
-1.2.107
+1.2.108

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.2.107",
+  "version": "1.2.108",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {