Merge ~gary-wzl77/charm-grafana:fix-1967046 into charm-grafana:master

[Gary.Wang]

fix(actions): do not add a user to the organisation again after an account has been created

By default, when creating a user with no parameter `OrgId` is specified
in the post body, the newly created user will be added to the same
organization where the admin account belongs to. Therefore there is
no need to add the user to the organisation again.

Adding the user to the organisation again causes the following error
to occur
```
{"message":"User is already member of this organization","userId":6}
```

This change fixed the issue LP:1967046.

Test: run the following command and check if the user can be added
      successfully
      ```
      juju run-action --wait grafana/0 create-user name="doe" \
           <email address hidden>" \
           login="doe" \
           password="redacted" \
           role="Viewer"
      ```

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Alvaro Uria (aluria)]

Please rebase your change. Functests are failing because of an assert out of scope of this MP.

review: Needs Fixing

[Gary.Wang (gary-wzl77)]

> Please rebase your change. Functests are failing because of an assert out of
> scope of this MP.
A: Done, could you take another look?

Unmerged commits

5a625b2... by Gary.Wang on 2022-03-30

fix(README): use the proper parameter in juju run-action

There is no `-w` parameter in juju run-action command but `--wait`.

2c6c1be... by Gary.Wang on 2022-03-30

fix(action): user proper action key

The action key must start and end with lowercase alphanumeric,
and contain only lowercase alphanumeric, hyphens and periods.
And the underscore is invalid character in the action key.

This change fixed that.

265675d... by Gary.Wang on 2022-03-30

fix(actions): do not add a user to the organisation again after an account has been created

By default, when creating a user with no parameter `OrgId` is specified
in the post body, the newly created user will be added to the same
organization where the admin account belongs to. Therefore there is
no need to add the user to the organisation again.

Adding the user to the organisation again causes the following error
to occur
```
{"message":"User is already member of this organization","userId":6}
```

This change fixed the issue LP:1967046.

Test: run the following command and check if the user can be added
      successfully
      ```
      juju run-action --wait grafana/0 create-user name="doe" \
           <email address hidden>" \
           login="doe" \
           password="redacted" \
           role="Viewer"
      ```

diff --git a/src/README.md b/src/README.md
index 1308bee..2fa457c 100644
--- a/src/README.md
+++ b/src/README.md
@@ -64,7 +64,7 @@ juju run-action --wait grafana/0 get-admin-password
 You can create a user:
 
 ```
-juju run-action -w grafana/0 create-user name="John Citizen" \
+juju run-action --wait grafana/0 create-user name="John Citizen" \
    email="[e-mail]" login="john" password="redacted" \
    role="Viewer"
 ```
diff --git a/src/actions/create-user b/src/actions/create-user
index 916534c..6a6e7da 100755
--- a/src/actions/create-user
+++ b/src/actions/create-user
@@ -53,11 +53,15 @@ if user_role not in valid_roles:
     action_fail("Role %s isn't valid, needs to be one of %s" % (user_role, valid_roles))
     sys.exit(0)
 
+# Must be an integer
+org_id=1
+
 user_data = {
     'name': name,
     'email': email,
     'login': login,
-    'password': user_password
+    'password': user_password,
+    'OrgId': org_id
 }
 
 headers = {'Content-Type': 'application/json'}
@@ -82,14 +86,7 @@ else:
     sys.exit(0)
 
 # http://docs.grafana.org/http_api/org/#get-organisation-by-id
-api_org_url = "/api/orgs/1" 
-
-# http://docs.grafana.org/http_api/org/#add-a-new-user-to-the-actual-organisation
-api_org_user_url = "/api/org/users"
-# {
-#  "role": "Admin",
-#  "loginOrEmail": "admin"
-# }
+api_org_url = "/api/orgs/" + str(org_id)
 
 grafana_api_org_url = grafana + api_org_url
 
@@ -106,27 +103,35 @@ else:
 if r_org.status_code == 200:
     org_data = r_org.json()
     org_name = org_data['name']
-    org_user_data = {"role": user_role, "loginOrEmail": login}
-
-    grafana_api_org_user_url = grafana + api_org_user_url
 
-    if requests.utils.urlparse(grafana_api_org_user_url).scheme:
-        r_userorg = requests.post(
-            grafana_api_org_user_url,
+    # By default, when creating a user with no parameter `OrgId` is specified
+    # in the post body, the newly created user will be added to the same
+    # organization where the admin account belongs to. Therefore there is no
+    # need to add the user to the organisation again but just update account's role.
+    #
+    # https://grafana.com/docs/grafana/latest/http_api/org/#updates-the-given-user
+    user_id = r_create.json()['id']
+    api_org_users_url = api_org_url + "/users/" + str(user_id)
+    grafana_api_org_users_url = grafana + api_org_users_url
+    org_user_data = {"role": user_role}
+
+    if requests.utils.urlparse(grafana_api_org_users_url).scheme:
+        r_userorg = requests.patch(
+            grafana_api_org_users_url,
             auth=api_auth,
             headers=headers,
             data=json.dumps(org_user_data),
             verify=verify_ca
         )
     else:
-        action_fail("Grafana url %s failed to parse" % (grafana_api_org_user_url))
+        action_fail("Grafana url %s failed to parse" % (grafana_api_org_users_url))
         sys.exit(0)
 
     if r_userorg.status_code == 200:
-        action_set({"organisation_name": org_name})
-        action_set({"organisation_role": user_role})
+        action_set({"organisation-name": org_name})
+        action_set({"organisation-role": user_role})
     else:
-        action_fail("Failed to add user to organisation")
+        action_fail("Failed to update user's role")
         sys.exit(0)
 else:
     action_fail("Failed to retrieve organisation details")