diff --git a/authentication_management.go b/authentication_management.go index c6e6387..25ffadd 100644 --- a/authentication_management.go +++ b/authentication_management.go @@ -48,8 +48,9 @@ func (c *Client) DeleteAuthenticatorConfig(accessToken string, realmName, config } // CreateAuthenticationExecution add new authentication execution -func (c *Client) CreateAuthenticationExecution(accessToken string, realmName string, authExec AuthenticationExecutionRepresentation) error { - return c.post(accessToken, nil, url.Path(authenticationManagementPath+"/executions"), url.Param("realm", realmName), body.JSON(authExec)) +func (c *Client) CreateAuthenticationExecution(accessToken string, realmName string, authExec AuthenticationExecutionRepresentation) (string, error) { + var location *string + return *location, c.post(accessToken, nil, location, url.Path(authenticationManagementPath+"/executions"), url.Param("realm", realmName), body.JSON(authExec)) } // DeleteAuthenticationExecution deletes the execution. @@ -59,22 +60,22 @@ func (c *Client) DeleteAuthenticationExecution(accessToken string, realmName, ex // UpdateAuthenticationExecution update execution with new configuration. func (c *Client) UpdateAuthenticationExecution(accessToken string, realmName, executionID string, authConfig AuthenticatorConfigRepresentation) error { - return c.post(accessToken, nil, url.Path(authenticationManagementPath+"/executions/:id/config"), url.Param("realm", realmName), url.Param("id", executionID), body.JSON(authConfig)) + return c.post(accessToken, nil, nil, url.Path(authenticationManagementPath+"/executions/:id/config"), url.Param("realm", realmName), url.Param("id", executionID), body.JSON(authConfig)) } // LowerExecutionPriority lowers the execution’s priority. func (c *Client) LowerExecutionPriority(accessToken string, realmName, executionID string) error { - return c.post(accessToken, nil, url.Path(authenticationManagementPath+"/executions/:id/lower-priority"), url.Param("realm", realmName), url.Param("id", executionID)) + return c.post(accessToken, nil, nil, url.Path(authenticationManagementPath+"/executions/:id/lower-priority"), url.Param("realm", realmName), url.Param("id", executionID)) } // RaiseExecutionPriority raise the execution’s priority. func (c *Client) RaiseExecutionPriority(accessToken string, realmName, executionID string) error { - return c.post(accessToken, nil, url.Path(authenticationManagementPath+"/executions/:id/raise-priority"), url.Param("realm", realmName), url.Param("id", executionID)) + return c.post(accessToken, nil, nil, url.Path(authenticationManagementPath+"/executions/:id/raise-priority"), url.Param("realm", realmName), url.Param("id", executionID)) } // CreateAuthenticationFlow creates a new authentication flow. func (c *Client) CreateAuthenticationFlow(accessToken string, realmName string, authFlow AuthenticationFlowRepresentation) error { - return c.post(accessToken, nil, url.Path(authenticationManagementPath+"/flows"), url.Param("realm", realmName), body.JSON(authFlow)) + return c.post(accessToken, nil, nil, url.Path(authenticationManagementPath+"/flows"), url.Param("realm", realmName), body.JSON(authFlow)) } // GetAuthenticationFlows returns a list of authentication flows. @@ -89,7 +90,7 @@ func (c *Client) GetAuthenticationFlows(accessToken string, realmName string) ([ // 'newName' is the new name of the authentication flow. func (c *Client) CopyExistingAuthenticationFlow(accessToken string, realmName, flowAlias, newName string) error { var m = map[string]string{"newName": newName} - return c.post(accessToken, nil, url.Path(authenticationManagementPath+"/flows/:flowAlias/copy"), url.Param("realm", realmName), url.Param("flowAlias", flowAlias), body.JSON(m)) + return c.post(accessToken, nil, nil, url.Path(authenticationManagementPath+"/flows/:flowAlias/copy"), url.Param("realm", realmName), url.Param("flowAlias", flowAlias), body.JSON(m)) } // GetAuthenticationExecutionForFlow returns the authentication executions for a flow. @@ -106,16 +107,18 @@ func (c *Client) UpdateAuthenticationExecutionForFlow(accessToken string, realmN // CreateAuthenticationExecutionForFlow add a new authentication execution to a flow. // 'flowAlias' is the alias of the parent flow. -func (c *Client) CreateAuthenticationExecutionForFlow(accessToken string, realmName, flowAlias, provider string) error { +func (c *Client) CreateAuthenticationExecutionForFlow(accessToken string, realmName, flowAlias, provider string) (string, error) { var m = map[string]string{"provider": provider} - return c.post(accessToken, url.Path(authenticationManagementPath+"/flows/:flowAlias/executions/execution"), url.Param("realm", realmName), url.Param("flowAlias", flowAlias), body.JSON(m)) + var location *string + return *location, c.post(accessToken, nil, location, url.Path(authenticationManagementPath+"/flows/:flowAlias/executions/execution"), url.Param("realm", realmName), url.Param("flowAlias", flowAlias), body.JSON(m)) } // CreateFlowWithExecutionForExistingFlow add a new flow with a new execution to an existing flow. // 'flowAlias' is the alias of the parent authentication flow. -func (c *Client) CreateFlowWithExecutionForExistingFlow(accessToken string, realmName, flowAlias, alias, flowType, provider, description string) error { +func (c *Client) CreateFlowWithExecutionForExistingFlow(accessToken string, realmName, flowAlias, alias, flowType, provider, description string) (string, error) { var m = map[string]string{"alias": alias, "type": flowType, "provider": provider, "description": description} - return c.post(accessToken, url.Path(authenticationManagementPath+"/flows/:flowAlias/executions/flow"), url.Param("realm", realmName), url.Param("flowAlias", flowAlias), body.JSON(m)) + var location *string + return *location, c.post(accessToken, nil, location, url.Path(authenticationManagementPath+"/flows/:flowAlias/executions/flow"), url.Param("realm", realmName), url.Param("flowAlias", flowAlias), body.JSON(m)) } // GetAuthenticationFlow gets the authentication flow for id. @@ -154,7 +157,7 @@ func (c *Client) GetConfigDescriptionForClients(accessToken string, realmName st // RegisterRequiredAction register a new required action. func (c *Client) RegisterRequiredAction(accessToken string, realmName, providerID, name string) error { var m = map[string]string{"providerId": providerID, "name": name} - return c.post(accessToken, url.Path(authenticationManagementPath+"/register-required-action"), url.Param("realm", realmName), body.JSON(m)) + return c.post(accessToken, nil, nil, url.Path(authenticationManagementPath+"/register-required-action"), url.Param("realm", realmName), body.JSON(m)) } // GetRequiredActions returns a list of required actions. diff --git a/client_attribute_certificate.go b/client_attribute_certificate.go index 8a0317e..a3ba1fb 100644 --- a/client_attribute_certificate.go +++ b/client_attribute_certificate.go @@ -21,34 +21,34 @@ func (c *Client) GetKeyInfo(accessToken string, realmName, idClient, attr string // GetKeyStore returns a keystore file for the client, containing private key and public certificate. idClient is the id of client (not client-id). func (c *Client) GetKeyStore(accessToken string, realmName, idClient, attr string, keyStoreConfig KeyStoreConfig) ([]byte, error) { var resp = []byte{} - var err = c.post(accessToken, &resp, url.Path(clientAttrCertPath+"/download"), url.Param("realm", realmName), url.Param("id", idClient), url.Param("attr", attr), body.JSON(keyStoreConfig)) + var err = c.post(accessToken, &resp, nil, url.Path(clientAttrCertPath+"/download"), url.Param("realm", realmName), url.Param("id", idClient), url.Param("attr", attr), body.JSON(keyStoreConfig)) return resp, err } // GenerateCertificate generates a new certificate with new key pair. idClient is the id of client (not client-id). func (c *Client) GenerateCertificate(accessToken string, realmName, idClient, attr string) (CertificateRepresentation, error) { var resp = CertificateRepresentation{} - var err = c.post(accessToken, &resp, url.Path(clientAttrCertPath+"/generate"), url.Param("realm", realmName), url.Param("id", idClient), url.Param("attr", attr)) + var err = c.post(accessToken, &resp, nil, url.Path(clientAttrCertPath+"/generate"), url.Param("realm", realmName), url.Param("id", idClient), url.Param("attr", attr)) return resp, err } // GenerateKeyPairAndCertificate generates a keypair and certificate and serves the private key in a specified keystore format. func (c *Client) GenerateKeyPairAndCertificate(accessToken string, realmName, idClient, attr string, keyStoreConfig KeyStoreConfig) ([]byte, error) { var resp = []byte{} - var err = c.post(accessToken, &resp, url.Path(clientAttrCertPath+"/generate-and-download"), url.Param("realm", realmName), url.Param("id", idClient), url.Param("attr", attr), body.JSON(keyStoreConfig)) + var err = c.post(accessToken, &resp, nil, url.Path(clientAttrCertPath+"/generate-and-download"), url.Param("realm", realmName), url.Param("id", idClient), url.Param("attr", attr), body.JSON(keyStoreConfig)) return resp, err } // UploadCertificatePrivateKey uploads a certificate and eventually a private key. func (c *Client) UploadCertificatePrivateKey(accessToken string, realmName, idClient, attr string, file []byte) (CertificateRepresentation, error) { var resp = CertificateRepresentation{} - var err = c.post(accessToken, &resp, url.Path(clientAttrCertPath+"/upload"), url.Param("realm", realmName), url.Param("id", idClient), url.Param("attr", attr), body.Reader(bytes.NewReader(file))) + var err = c.post(accessToken, &resp, nil, url.Path(clientAttrCertPath+"/upload"), url.Param("realm", realmName), url.Param("id", idClient), url.Param("attr", attr), body.Reader(bytes.NewReader(file))) return resp, err } // UploadCertificate uploads only a certificate, not the private key. func (c *Client) UploadCertificate(accessToken string, realmName, idClient, attr string, file []byte) (CertificateRepresentation, error) { var resp = CertificateRepresentation{} - var err = c.post(accessToken, &resp, url.Path(clientAttrCertPath+"/upload-certificate"), url.Param("realm", realmName), url.Param("id", idClient), url.Param("attr", attr), body.Reader(bytes.NewReader(file))) + var err = c.post(accessToken, &resp, nil, url.Path(clientAttrCertPath+"/upload-certificate"), url.Param("realm", realmName), url.Param("id", idClient), url.Param("attr", attr), body.Reader(bytes.NewReader(file))) return resp, err } diff --git a/client_initial_access.go b/client_initial_access.go index 942d4ee..ed05991 100644 --- a/client_initial_access.go +++ b/client_initial_access.go @@ -12,7 +12,7 @@ const ( // CreateClientInitialAccess creates a new initial access token. func (c *Client) CreateClientInitialAccess(accessToken string, realmName string, access ClientInitialAccessCreatePresentation) (ClientInitialAccessPresentation, error) { var resp = ClientInitialAccessPresentation{} - var err = c.post(accessToken, &resp, url.Path(clientInitialAccessPath), url.Param("realm", realmName), body.JSON(access)) + var err = c.post(accessToken, &resp, nil, url.Path(clientInitialAccessPath), url.Param("realm", realmName), body.JSON(access)) return resp, err } diff --git a/client_role_mappings.go b/client_role_mappings.go index bf96db3..3377e35 100644 --- a/client_role_mappings.go +++ b/client_role_mappings.go @@ -11,7 +11,7 @@ const ( // CreateClientsRoleMapping add client-level roles to the user role mapping. func (c *Client) CreateClientsRoleMapping(accessToken string, realmName, groupID, clientID string, roles []RoleRepresentation) error { - return c.post(accessToken, nil, url.Path(clientRoleMappingPath), url.Param("realm", realmName), url.Param("id", groupID), url.Param("client", clientID), body.JSON(roles)) + return c.post(accessToken, nil, nil, url.Path(clientRoleMappingPath), url.Param("realm", realmName), url.Param("id", groupID), url.Param("client", clientID), body.JSON(roles)) } // GetClientsRoleMapping gets client-level role mappings for the user, and the app. diff --git a/keycloak_client.go b/keycloak_client.go index b367dc9..eb0ca82 100644 --- a/keycloak_client.go +++ b/keycloak_client.go @@ -90,6 +90,9 @@ func (c *Client) GetToken(realm string, username string, password string) (strin } } + fmt.Printf("%s", accessToken.(string)) + fmt.Println() + return accessToken.(string), nil } @@ -147,7 +150,7 @@ func (c *Client) get(accessToken string, data interface{}, plugins ...plugin.Plu } } -func (c *Client) post(accessToken string, data interface{}, plugins ...plugin.Plugin) error { +func (c *Client) post(accessToken string, data interface{}, location *string, plugins ...plugin.Plugin) error { var req = c.httpClient.Post() req = applyPlugins(req, accessToken, plugins...) var resp *gentleman.Response @@ -164,6 +167,9 @@ func (c *Client) post(accessToken string, data interface{}, plugins ...plugin.Pl case resp.StatusCode >= 400: return fmt.Errorf("invalid status code: '%v': %v", resp.RawResponse.Status, string(resp.Bytes())) case resp.StatusCode >= 200: + var l = resp.Header.Get("Location") + location = &l + switch resp.Header.Get("Content-Type") { case "application/json": return resp.JSON(data) diff --git a/realm.go b/realm.go index 9e61091..802282b 100644 --- a/realm.go +++ b/realm.go @@ -20,8 +20,9 @@ func (c *Client) GetRealms(accessToken string) ([]RealmRepresentation, error){ } // CreateRealm creates the realm from its RealmRepresentation. -func (c *Client) CreateRealm(accessToken string, realm RealmRepresentation) error { - return c.post(accessToken, nil, url.Path(realmRootPath), body.JSON(realm)) +func (c *Client) CreateRealm(accessToken string, realm RealmRepresentation) (string, error) { + var location *string + return *location, c.post(accessToken, nil, location, url.Path(realmRootPath), body.JSON(realm)) } // GetRealm get the top level represention of the realm. Nested information like users are diff --git a/users.go b/users.go index d6dc7ca..4f6349c 100644 --- a/users.go +++ b/users.go @@ -29,8 +29,9 @@ func (c *Client) GetUsers(accessToken string, realmName string, paramKV ...strin } // CreateUser creates the user from its UserRepresentation. The username must be unique. -func (c *Client) CreateUser(accessToken string, realmName string, user UserRepresentation) error { - return c.post(accessToken, nil, url.Path(userPath), url.Param("realm", realmName), body.JSON(user)) +func (c *Client) CreateUser(accessToken string, realmName string, user UserRepresentation) (string, error) { + var location *string + return *location, c.post(accessToken, nil, location, url.Path(userPath), url.Param("realm", realmName), body.JSON(user)) } // CountUsers returns the number of users in the realm.