dudeswave/src/dudeswave_auth_handler.erl

@@ -146,7 +146,7 @@ resource_exists(Req, State) ->
 	#{dudename := User} = cowboy_req:match_cookies([dudename], Req),
 	{ok, Bucket} = maps:find(bucket, State),
 
-	case dudeswave_auth:details(User, Bucket) of
+	case dudeswave_auth:user_details(User, Bucket) of
 		[] ->
 			Resp = json:encode(#{<<"error">> => <<"user does not exists">>}),
 			Req0 = cowboy_req:reply(404, #{}, Resp, Req),
@@ -193,8 +193,8 @@ delete_completed(Req, State) -> {false, Req, State}.
 %
 
 login(Req, State) ->
-	{ok, Cookies} = maps:find(cookies, State),
-	{ok, Bucket} = maps:find(bucket, State),
+	{ok, Cookies} = maps:find(State, cookies),
+	{ok, Bucket} = maps:find(State, bucket),
 
 	{ok, Data, Req0} = cowboy_req:read_body(Req),
 	#{<<"user">> := User, <<"password">> := Pass} = json:decode(Data),

dudeswave/src/dudeswave_user_handler.erl

@@ -181,11 +181,8 @@ forbidden(Req, State) ->
 			    dudename], Req),
 			{ok, Bucket} = maps:find(cookies, State),
 
-			case dudeswave_auth:authenticate(User, Auth, Bucket) of
-				{error, service_unavailable} ->
-					Resp = json:encode(#{<<"error">> => <<"internal server error">>}),
-					Req0 = cowboy_req:reply(500, #{}, Resp, Req),
-					{true, Req0, State};
+			case dudeswave_auth:authenticate({cookie, User, Auth}, Bucket) of
+				{error, service_unavailable} -> exit(service_unavailable);
 				true ->
 					Resp = json:encode(#{<<"error">> => <<"authentication required">>}),
 					Req0 = cowboy_req:reply(403, #{}, Resp, Req),
@@ -218,7 +215,7 @@ resource_exists(Req, State) ->
 	#{dudename := User} = cowboy_req:match_cookies([dudename], Req),
 	{ok, Bucket} = maps:find(bucket, State),
 
-	case dudeswave_auth:details(User, Bucket) of
+	case dudeswave_auth:user_details(User, Bucket) of
 		[] ->
 			Resp = json:encode(#{<<"error">> => <<"user does not exists">>}),
 			Req0 = cowboy_req:reply(404, #{}, Resp, Req),
@@ -271,37 +268,35 @@ create_user(Req, State) ->
 	{ok, Bucket} = maps:find(bucket, State),
 	#{dudename := User} = cowboy_req:match_cookies([dudename], Req),
 
-	{ok, Data, Req0} = cowboy_req:read_body(Req),
-	#{<<"password">> := Pass, <<"email">> := Email}  = json:decode(Data),
+	#{<<"password">> := Pass, <<"email">> := Email}  = json:decode(cowboy_req:body(req)),
 
-	case dudeswave_auth:new(User, Pass, Email, Bucket) of
+	case dudeswave_auth:new_user(User, Pass, Email, Bucket) of
 		ok ->
 			Resp = json:encode(#{<<"result">> => <<"created">>}),
-			Req1 = cowboy_req:reply(201, #{}, Resp, Req0),
-			{true, Req1, []};
-		{error, _} ->
+			Req0 = cowboy_req:reply(201, #{}, Resp, Req),
+			{true, Req0, []};
+		{error, Reason} ->
 			Resp = json:encode(#{<<"error">> => <<"internal server error">>}),
-			Req1 = cowboy_req:reply(500, #{}, Resp, Req0),
-			{false, Req1, State}
+			Req0 = cowboy_req:reply(500, #{}, Resp, Req),
+			{false, Req0, Reason}
 	end.
 
 modify_user(Req, State) ->
 	{ok, Bucket} = maps:find(bucket, State),
 	#{dudename := User} = cowboy_req:match_cookies([dudename], Req),
 
-	{ok, Data, Req0} = cowboy_req:read_body(Req),
 	#{<<"email">> := Email, <<"description">> := Desc,
-	    <<"name">> := Name} = json:decode(Data),
+	    <<"name">> := Name} = json:decode(cowboy_req:body(req)),
 
 	case dudeswave_auth:update(User, Name, Email, Desc, Bucket) of
 		ok ->
 			Resp = json:encode(#{<<"result">> => <<"details updated">>}),
 			Req0 = cowboy_req:reply(200, #{}, Resp, Req),
 			{true, Req0, []};
-		{error, _} ->
+		{error, Reason} ->
 			Resp = json:encode(#{<<"error">> => <<"internal server error">>}),
 			Req0 = cowboy_req:reply(500, #{}, Resp, Req),
-			{false, Req0, State}
+			{false, Req0, Reason}
 	end.
 
 user_details(Req, State) ->