merge in develop

Author: robotdan

.github/kickstart/kickstart.json

@@ -70,9 +70,6 @@
             "admin"
           ]
         },
-        "roles": [
-          "admin"
-        ],
         "skipRegistrationVerification": true,
         "user": {
           "birthDate": "1981-06-04",

.github/workflows/deploy.yaml

@@ -6,8 +6,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
   workflow_dispatch:
     inputs:
       command:
@@ -53,31 +51,31 @@ jobs:
       - name: install golang
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: oldstable
 
       - name: Compile
-        if: inputs.command != 'release'
+        if: success() && inputs.command != 'release'
         run: sb compile
 
       - name: Copy our kickstart file over so it gets picked up
-        if: inputs.command != 'release'
+        if: success() && inputs.command != 'release'
         run: |
           mkdir faDockerComposeFilePath
           cp -r .github/kickstart faDockerComposeFilePath
           cp .github/kickstart/kickstart.json faDockerComposeFilePath/kickstart/k2.json
           cp .github/kickstart/kickstart.json .github/kickstart/k2.json
 
       - name: Start FusionAuth
-        if: inputs.command != 'release'
+        if: success() && inputs.command != 'release'
         uses: fusionauth/fusionauth-github-action@v1
         with:
           FUSIONAUTH_APP_KICKSTART_FILENAME: k2.json
           FUSIONAUTH_APP_KICKSTART_DIRECTORY_PATH: .github/kickstart
 
       - name: Run tests
-        if: inputs.command != 'release'
+        if: success() && inputs.command != 'release'
         run: sleep 30 && sb test
 
       - name: release to svn
-        if: inputs.command == 'release'
+        if: success() && inputs.command == 'release'
         run: sb release

build.savant

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2024, FusionAuth, All Rights Reserved
+ * Copyright (c) 2019-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: "go-client", version: "1.59.0", licenses: ["ApacheV2_0"]) {
+project(group: "io.fusionauth", name: "go-client", version: "1.60.0", licenses: ["ApacheV2_0"]) {
   workflow {
     fetch {
       cache()
@@ -50,7 +50,7 @@ target(name: "format", description: "Formats the source code") {
 
   def process = pb.start()
   process.consumeProcessOutput(System.out, System.err)
-  process.waitFor()
+  assert process.waitFor() == 0
 }
 
 target(name: "compile", description: "Compiles the source code", dependsOn: ["format"]) {
@@ -60,7 +60,7 @@ target(name: "compile", description: "Compiles the source code", dependsOn: ["fo
 
   def process = pb.start()
   process.consumeProcessOutput(System.out, System.err)
-  process.waitFor()
+  assert process.waitFor() == 0
 }
 
 target(name: "test", description: "Runs the project's unit tests", dependsOn: ["compile"]) {
@@ -70,7 +70,7 @@ target(name: "test", description: "Runs the project's unit tests", dependsOn: ["
 
   def process = pb.start()
   process.consumeProcessOutput(System.out, System.err)
-  process.waitFor()
+  assert process.waitFor() == 0
 }
 
 target(name: "int", description: "Releases a local integration build of the project", dependsOn: ["compile"]) {

go.mod

@@ -1,5 +1,11 @@
 module github.com/FusionAuth/go-client
 
-go 1.24
+go 1.23.0
 
-require github.com/stretchr/testify v1.6.1
+require github.com/stretchr/testify v1.10.0
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -1,10 +1,10 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/fusionauth/Client_test.go

@@ -60,6 +60,28 @@ func TestRetrieveUserSuccess(t *testing.T) {
 	assert.Equal(t, 200, userResponse.StatusCode)
 }
 
+func TestRetrieveUserByLoginIdSuccess(t *testing.T) {
+	loginIdTypes := []string{"email"}
+
+	userResponse, errors, _ := faClient.RetrieveUserByLoginIdWithLoginIdTypes("[email protected]", loginIdTypes)
+	errJson, _ := json.Marshal(errors)
+	fmt.Println(string(errJson))
+
+	assert.Equal(t, (*Errors)(nil), errors)
+	assert.Equal(t, 200, userResponse.StatusCode)
+}
+
+// TODO: Will pass when issue 1 is released
+// func TestRetrieveUserByLoginIdWrongIdentityType(t *testing.T) {
+// 	loginIdTypes := []string{"phoneNumber"}
+//
+// 	userResponse, errors, _ := faClient.RetrieveUserByLoginIdWithLoginIdTypes("[email protected]", loginIdTypes)
+// 	errJson, _ := json.Marshal(errors)
+// 	fmt.Println(string(errJson))
+//
+// 	assert.Equal(t, 404, userResponse.StatusCode)
+// }
+
 func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }