From 4cef9fdb29a4b75767561088694526282ec781d9 Mon Sep 17 00:00:00 2001
From: erebion <noreply@erebion.eu>
Date: Tue, 6 Jan 2026 20:47:02 +0100
Subject: [PATCH] rewrite zuginfo_api_create_webpush_subscription.yml

---
 ...uginfo_api_create_webpush_subscription.yml | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/zuginfo_playbooks/zuginfo_api_create_webpush_subscription.yml b/zuginfo_playbooks/zuginfo_api_create_webpush_subscription.yml
index 2539232..a7354b4 100644
--- a/zuginfo_playbooks/zuginfo_api_create_webpush_subscription.yml
+++ b/zuginfo_playbooks/zuginfo_api_create_webpush_subscription.yml
@@ -4,13 +4,20 @@
   hosts: localhost
   vars:
     unix_time_millis: "1762342729099"
-    push_endpoint: ""
-    push_key_auth: ""
-    push_key_p256dh: ""
-    aid: ""
-    mysterious_id: ""
 
   tasks:
+    - name: Account data
+      ansible.builtin.set_fact:
+        account: "{{ lookup('ansible.builtin.file','account.txt') | from_yaml }}"
+
+    - name: Set variables
+      ansible.builtin.set_fact:
+        aid: "{{ account.account.aid }}"
+        mysterious_id: "{{ account.account.mysterious_id }}"
+        push_endpoint: "{{ account.account.push_endpoint }}"
+        push_key_auth: "{{ account.account.push_key_auth }}"
+        push_key_p256dh: "{{ account.account.push_key_p256dh }}"
+
     - name: "Create WebPush Subscription"
       ansible.builtin.uri:
         url: "https://www.zuginfo.nrw/gate/?requestId={{ mysterious_id }}&hciMethod=SubscrUserCreate&hciVersion=1.24&hciClientType=WEB&hciClientVersion=10104&aid={{ aid }}&rnd={{ unix_time_millis }}"
@@ -62,13 +69,13 @@
           TE: trailers
       register: subscribe_s4
 
-    - name: "subscribe_s4"
-      ansible.builtin.debug:
-        msg: "{{ subscribe_s4 }}"
-
     - set_fact:
         subscription_id: "{{ subscribe_s4.json.svcResL[0].res.subscrId }}"
 
+    - name: "Print subscription_id"
+      ansible.builtin.debug:
+        msg: "{{ subscription_id }}"
+
     - name: "Verify Subscription"
       ansible.builtin.uri:
         url: "https://www.zuginfo.nrw/gate/?requestId={{ mysterious_id }}&hciMethod=SubscrDetails&hciVersion=1.24&hciClientType=WEB&hciClientVersion=10104&aid={{ aid }}&rnd={{ unix_time_millis }}"
@@ -86,9 +93,10 @@
       ansible.builtin.debug:
         msg: "{{ verify_subscription }}"
 
+
     - name: "Print important IDs"
       ansible.builtin.debug:
         msg:
         - "Please save the following IDs:"
-        - "user_id: {{ user_id }}"
         - "channel_id: {{ channel_id }}"
+        - "user_id: {{ user_id }}"