From d7f54062fc8b5d83644b25d263f66599437c906d Mon Sep 17 00:00:00 2001
From: Luka Vandervelden <lukc@upyum.com>
Date: Wed, 5 Jun 2019 22:30:29 +0200
Subject: [PATCH] Updates for new libipc APIs.

---
 src/authd.cr  | 14 +++++++-------
 src/main.cr   | 17 ++++++++++++-----
 src/passwd.cr |  2 --
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/authd.cr b/src/authd.cr
index e97839b..bd5648d 100644
--- a/src/authd.cr
+++ b/src/authd.cr
@@ -63,7 +63,7 @@ module AuthD
 		})
 	end
 
-	class Client < IPC::Client
+	class Client < IPC::Connection
 		property key : String
 
 		def initialize
@@ -80,7 +80,7 @@ module AuthD
 
 			response = read
 
-			if response.type == ResponseTypes::Ok.value.to_u8
+			if response.user_type == ResponseTypes::Ok.value.to_u8
 				response.payload
 			else
 				nil
@@ -95,7 +95,7 @@ module AuthD
 
 			response = read
 
-			if response.type == ResponseTypes::Ok.value.to_u8
+			if response.user_type == ResponseTypes::Ok.value.to_u8
 				User.from_json response.payload
 			else
 				nil
@@ -107,7 +107,7 @@ module AuthD
 
 			response = read
 
-			if response.type == ResponseTypes::Ok.value.to_u8
+			if response.user_type == ResponseTypes::Ok.value.to_u8
 				User.from_json response.payload
 			else
 				nil
@@ -135,8 +135,8 @@ module AuthD
 
 			response = read
 
-			pp! response.type
-			case ResponseTypes.new response.type.to_i
+			pp! response.user_type
+			case ResponseTypes.new response.user_type.to_i
 			when ResponseTypes::Ok
 				AuthD::User.from_json response.payload
 			else
@@ -160,7 +160,7 @@ module AuthD
 
 			response = read
 
-			case ResponseTypes.new response.type.to_i
+			case ResponseTypes.new response.user_type.to_i
 			when ResponseTypes::Ok
 				true
 			else
diff --git a/src/main.cr b/src/main.cr
index 2bcceac..295dc21 100644
--- a/src/main.cr
+++ b/src/main.cr
@@ -11,9 +11,9 @@ require "./passwd.cr"
 
 extend AuthD
 
-class IPC::RemoteClient
-	def send(type : ResponseTypes, payload : String)
-		send type.value.to_u8, payload
+class IPC::Connection
+	def send(type : AuthD::ResponseTypes, payload : String)
+		send type.to_u8, payload
 	end
 end
 
@@ -46,14 +46,21 @@ passwd = Passwd.new authd_passwd_file, authd_group_file
 ##
 # Provides a JWT-based authentication scheme for service-specific users.
 IPC::Service.new "auth" do |event|
-	client = event.client
+	if event.is_a? IPC::Exception
+		puts "oh no"
+		pp! event
+		next
+	end
+
+	client = event.connection
 	
 	case event
 	when IPC::Event::Message
 		message = event.message
 		payload = message.payload
+		pp message
 
-		case RequestTypes.new message.type.to_i
+		case RequestTypes.new message.user_type.to_i
 		when RequestTypes::GetToken
 			begin
 				request = GetTokenRequest.from_json payload
diff --git a/src/passwd.cr b/src/passwd.cr
index e65b5be..4c5ad3d 100644
--- a/src/passwd.cr
+++ b/src/passwd.cr
@@ -38,8 +38,6 @@ class Passwd
 			if group.users.any? { |name| name == user.login }
 				user.groups << group.name
 			end
-
-			pp group
 		end
 	end