Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add rest api #78

Merged
merged 8 commits into from Apr 1, 2019

Conversation

@linjunjj
Copy link
Contributor

linjunjj commented Mar 29, 2019

Description

Add rest api for support clientid CURD and add rest api test case, Introducing emqx_ct_helper in the test cases.

@tigercl

This comment has been minimized.

Copy link
Contributor

tigercl commented Mar 30, 2019

Please update ReadMe

Makefile Outdated

BUILD_DEPS = emqx cuttlefish
BUILD_DEPS = emqx cuttlefish emqx_management

This comment has been minimized.

Copy link
@tigercl

tigercl Mar 30, 2019

Contributor

Remove dep for emqx_management


format([{?APP, ClientId, Password}]) ->
[{clientid, ClientId},
{password, emqx_auth_clientid:unwap_salt(Password)}].

This comment has been minimized.

Copy link
@tigercl

tigercl Mar 30, 2019

Contributor

unwap_salt -> unwrap_salt

@@ -28,6 +28,7 @@

-export([ init/1
, check/2
, unwarp_salt/1

This comment has been minimized.

Copy link
@gilbertwong96

gilbertwong96 Mar 30, 2019

Contributor

unwrap

@@ -149,6 +150,9 @@ check(Credentials = #{client_id := ClientId, password := Password}, #{hash_type
end
end.

unwarp_salt(<<_Salt:4/binary, HashPasswd/binary>>) ->

This comment has been minimized.

Copy link
@tigercl

tigercl Mar 30, 2019

Contributor

unwarp_salt -> unwrap_salt

%%------------------------------------------------------------------------------

return() ->
emqx_mgmt:return().

This comment has been minimized.

Copy link
@HJianBo

HJianBo Mar 31, 2019

Member
  1. Replace this fun with minirest:return/x
  2. Update the minirest dependency to v0.2.2
Makefile Outdated
dep_emqx_passwd = git-emqx https://github.com/emqx/emqx-passwd v1.0
dep_clique = git-emqx https://github.com/emqx/clique v0.3.11
dep_minirest = git-emqx https://github.com/emqx/minirest v0.2.0

This comment has been minimized.

Copy link
@tigercl

tigercl Apr 1, 2019

Contributor

v0.2.0 -> v0.2.2

README.md Outdated

List all clientids
```
#Request

This comment has been minimized.

Copy link
@tigercl

tigercl Apr 1, 2019

Contributor

Add space between '#' and 'Request'

@@ -28,6 +28,7 @@

-export([ init/1
, check/2
, unwrap_salt/1

This comment has been minimized.

Copy link
@tigercl

tigercl Apr 1, 2019

Contributor

move unwrap_salt/1 to single export

linjunjj and others added 6 commits Apr 1, 2019
@HJianBo
HJianBo approved these changes Apr 1, 2019
@HJianBo HJianBo merged commit 3834314 into develop Apr 1, 2019
@HJianBo HJianBo deleted the add_http_api branch Apr 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.