Revert "fix: try password authentication for users"

This reverts commit 2df238f.

Author: SMillerDev

influxdb/users.sls

@@ -24,36 +24,30 @@ get_user_{{ name }}:
     - name: '{{ base_url }}/api/v2/users/?name={{ name }}'
     - status: 200
     - method: GET
-    - username: 'admin'
-    - password: '{{ influxdb['user']['admin']['token'] }}'
-    # - header_dict:
-    #     Authorization: Token {{ influxdb['user']['admin']['token'] }}
+    - header_dict:
+        Authorization: Token {{ influxdb['user']['admin']['token'] }}
 
 create_user_{{ name }}:
   http.query:
     - name: '{{ base_url }}/api/v2/users'
     - status: 201
     - method: POST
     - data: '{"name": "{{ name }}"}'
-    - username: 'admin'
-    - password: '{{ influxdb['user']['admin']['token'] }}'
-    # - header_dict:
-    #     Authorization: Token {{ influxdb['user']['admin']['token'] }}
+    - header_dict:
+        Authorization: Token {{ influxdb['user']['admin']['token'] }}
     - onfail:
         - http: get_user_{{ name }}
 
-{%- set id = salt['cmd.shell']("curl -s -f -u'admin:" ~ influxdb['user']['admin']['token'] ~ "' '" ~ base_url ~ "/api/v2/users?name=" ~ name ~ "' | jq -r '.users[0].id'") %}
+{%- set id = salt['cmd.shell']("curl -s -f -H'Authorization: Token " ~ influxdb['user']['admin']['token'] ~ "' '" ~ base_url ~ "/api/v2/users?name=" ~ name ~ "' | jq -r '.users[0].id'") %}
 {% if "password" in config %}
 set_password_{{ name }}:
   http.query:
     - name: '{{ base_url }}/api/v2/users/{{ id }}/password'
     - status: 204
     - method: POST
     - data: '{"password": "{{ config["password"] }}"}'
-    - username: 'admin'
-    - password: '{{ influxdb['user']['admin']['token'] }}'
-    # - header_dict:
-    #     Authorization: Token {{ influxdb['user']['admin']['token'] }}
+    - header_dict:
+        Authorization: Token {{ influxdb['user']['admin']['token'] }}
 {% endif %}
 
 {% if "grants" in config %}
@@ -66,21 +60,17 @@ check_grant_user_{{ name }}_to_{{ bucket }}:
     - method: GET
     - match: '"{{ name }}"'
     - match_type: string
-    - username: 'admin'
-    - password: '{{ influxdb['user']['admin']['token'] }}'
-    # - header_dict:
-    #     Authorization: Token {{ influxdb['user']['admin']['token'] }}
+    - header_dict:
+        Authorization: Token {{ influxdb['user']['admin']['token'] }}
 
 grant_user_{{ name }}_to_{{ bucket }}:
   http.query:
     - name: '{{ base_url }}/api/v2/buckets/{{ bucketID }}/members'
     - status: 201
     - method: POST
     - data: '{"name": "{{ name }}", "id": "{{ id }}"}'
-    - username: 'admin'
-    - password: '{{ influxdb['user']['admin']['token'] }}'
-    # - header_dict:
-    #     Authorization: Token {{ influxdb['user']['admin']['token'] }}
+    - header_dict:
+        Authorization: Token {{ influxdb['user']['admin']['token'] }}
     - onfail:
         - http: check_grant_user_{{ name }}_to_{{ bucket }}
 {%- endfor %}