merge in develop

Author: robotdan

.github/workflows/test.yaml

@@ -10,9 +10,6 @@ on:
       - main
       - develop
   pull_request:
-    branches:
-      - main
-      - develop
   workflow_dispatch:
 
 jobs:

build.savant

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2024, FusionAuth, All Rights Reserved
+ * Copyright (c) 2018-2025, FusionAuth, All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * language governing permissions and limitations under the License.
  */
 
-project(group: "io.fusionauth", name: "fusionauth-python-client", version: "1.58.0", licenses: ["ApacheV2_0"]) {
+project(group: "io.fusionauth", name: "fusionauth-python-client", version: "1.60.0", licenses: ["ApacheV2_0"]) {
   workflow {
     fetch {
       cache()
@@ -50,7 +50,7 @@ target(name: "clean", description: "Cleans the build directory") {
 target(name: "compile", description: "Builds archives of the source and compiled versions of the code.", dependsOn: ["setup-python"]) {
   def proc = "python3 setup.py sdist bdist_wheel".execute()
   proc.consumeProcessOutput(System.out, System.err)
-  proc.waitFor()
+  assert proc.waitFor() == 0
 }
 
 target(name: "int", description: "Releases a local integration build of the project", dependsOn: ["compile"]) {
@@ -78,11 +78,11 @@ target(name: "test", description: "Runs the project's tests", dependsOn: ["compi
 target(name: "setup-python", description: "Gets the python dependencies") {
   def proc1 = "python3 -m pip install --user --upgrade setuptools".execute()
   proc1.consumeProcessOutput(System.out, System.err)
-  proc1.waitFor()
+  assert proc1.waitFor() == 0
 
   def proc2 = "python3 -m pip install --user --upgrade wheel twine requests deprecated".execute()
   proc2.consumeProcessOutput(System.out, System.err)
-  proc2.waitFor()
+  assert proc2.waitFor() == 0
 }
 
 /**
@@ -104,8 +104,7 @@ target(name: "publish", description: "Publishes source and built versions of the
 
   def process = pb.start()
   process.consumeProcessOutput(System.out, System.err)
-  process.waitFor()
-  return process.exitValue() == 0
+  assert process.waitFor() == 0
 }
 
 target(name: "release", description: "Releases a full version of the project", dependsOn: ["int"]) {

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="fusionauth-client",
-    version="1.58.0",
+    version="1.60.0",
     author="FusionAuth",
     author_email="dev@fusionauth.io",
     description="A client library for FusionAuth",

src/test/python/fusionauth/fusionauth_client_test.py

@@ -1,4 +1,28 @@
-#  Copyright (c) 2024, FusionAuth, All Rights Reserved
+#  Copyright (c) 2024-2025, FusionAuth, All Rights Reserved
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+#  either express or implied. See the License for the specific
+#  language governing permissions and limitations under the License.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+#  either express or implied. See the License for the specific
+#  language governing permissions and limitations under the License.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -26,9 +50,8 @@
 
 import json
 import os
-import uuid
-
 import unittest
+import uuid
 
 from fusionauth.fusionauth_client import FusionAuthClient
 
@@ -51,7 +74,8 @@ def runTest(self):
     def test_retrieve_applications(self):
         client_response = self.client.retrieve_applications()
         self.assertEqual(client_response.status, 200)
-        self.assertEqual(len(client_response.success_response['applications']), 2)
+        # tnent manager is 1 application, admin is another, Pied piper in the kickstart is the 3rd.
+        self.assertEqual(len(client_response.success_response['applications']), 3)
 
     def test_create_user_retrieve_user(self):
         # Check if the user already exists.
@@ -84,6 +108,25 @@ def test_create_user_retrieve_user(self):
         self.assertFalse('password' in get_user_response.success_response['user'])
         self.assertFalse('salt' in get_user_response.success_response['user'])
 
+        # Retrieve the user via loginId
+        get_user_response = self.client.retrieve_user_by_login_id('user@example.com')
+        self.assertEqual(get_user_response.status, 200)
+        self.assertIsNotNone(get_user_response.success_response)
+        self.assertIsNone(get_user_response.error_response)
+        self.assertEqual(get_user_response.success_response['user']['email'], 'user@example.com')
+
+        # Explicit loginIdType
+        get_user_response = self.client.retrieve_user_by_login_id_with_login_id_types('user@example.com', ['email'])
+        self.assertEqual(get_user_response.status, 200)
+        self.assertIsNotNone(get_user_response.success_response)
+        self.assertIsNone(get_user_response.error_response)
+        self.assertEqual(get_user_response.success_response['user']['email'], 'user@example.com')
+
+    # TODO: Once issue 1 is released, this test should pass
+    #        # wrong loginIdType
+    #         get_user_response = self.client.retrieve_user_by_login_id_with_login_id_types('user@example.com', ['phoneNumber'])
+    #         self.assertEqual(get_user_response.status, 404)
+
     def test_retrieve_user_missing(self):
         user_id = uuid.uuid4()
         client_response = self.client.retrieve_user(user_id)