From e41e558c5faeac4c9619362ac441f0e0ac831d25 Mon Sep 17 00:00:00 2001
From: Michael Drake <michael.drake@codethink.co.uk>
Date: Mon, 13 Aug 2018 17:43:41 +0100
Subject: Haiku: Update for new HTTP auth API.

---
 frontends/beos/gui.h      |  7 ++++++-
 frontends/beos/login.cpp  | 31 ++++++++++++++++++++++++-------
 frontends/beos/window.cpp | 15 +++++++++------
 3 files changed, 39 insertions(+), 14 deletions(-)

(limited to 'frontends/beos')

diff --git a/frontends/beos/gui.h b/frontends/beos/gui.h
index debb5f339..35f3134fb 100644
--- a/frontends/beos/gui.h
+++ b/frontends/beos/gui.h
@@ -35,7 +35,12 @@ extern bool nsbeos_done;
 extern bool replicated;
 int gui_init_replicant(int argc, char** argv);
 
-extern "C" void gui_401login_open(struct nsurl *url, const char *realm, nserror (*cb)(bool proceed, void *pw), void *cbpw);
+extern "C" void nserror gui_401login_open(nsurl *url, const char *realm,
+		const char *username, const char *password,
+		nserror (*cb)(const char *username,
+				const char *password,
+				void *pw),
+		void *cbpw);
 
 extern "C" void nsbeos_gui_poll(void);
 
diff --git a/frontends/beos/login.cpp b/frontends/beos/login.cpp
index 85062987c..b7e20edf5 100644
--- a/frontends/beos/login.cpp
+++ b/frontends/beos/login.cpp
@@ -44,7 +44,9 @@ extern "C" {
 
 class LoginAlert : public BAlert {
 public:
-        LoginAlert(nserror (*callback)(bool proceed, void *pw),
+        LoginAlert(nserror (*callback)(const char *username,
+				const char *password,
+				void *pw),
                    void *callbaclpw,
                    nsurl *url,
                    const char *host,
@@ -57,7 +59,9 @@ private:
         nsurl* fUrl;				/**< URL being fetched */
         BString fHost;				/**< Host for user display */
         BString fRealm;				/**< Authentication realm */
-        nserror (*fCallback)(bool proceed, void *pw);
+        nserror (*fCallback)(const char *username,
+			const char *password,
+			void *pw);
         void *fCallbackPw;
 
         BTextControl *fUserControl;
@@ -66,13 +70,17 @@ private:
 
 static void create_login_window(nsurl *host,
                 lwc_string *realm, const char *fetchurl,
-                nserror (*cb)(bool proceed, void *pw), void *cbpw);
+                nserror (*cb)(const char *username,
+				const char *password,
+				void *pw), void *cbpw);
 
 
 #define TC_H 25
 #define TC_MARGIN 10
 
-LoginAlert::LoginAlert(nserror (*callback)(bool proceed, void *pw),
+LoginAlert::LoginAlert(nserror (*callback)(const char *username,
+						const char *password,
+						void *pw),
 				void *callbackpw,
 				nsurl *url, 
 				const char *host, 
@@ -164,8 +172,12 @@ LoginAlert::MessageReceived(BMessage *message)
 }
 
 
-extern "C" void gui_401login_open(nsurl *url, const char *realm,
-		nserror (*cb)(bool proceed, void *pw), void *cbpw)
+extern "C" nserror gui_401login_open(nsurl *url, const char *realm,
+		const char *username, const char *password,
+		nserror (*cb)(const char *username,
+				const char *password,
+				void *pw),
+		void *cbpw)
 {
 	lwc_string *host;
 
@@ -174,12 +186,17 @@ extern "C" void gui_401login_open(nsurl *url, const char *realm,
 	create_login_window(url, host, realm, cb, cbpw);
 
 	free(host);
+
+	return NSERROR_OK;
 }
 
 //void create_login_window(struct browser_window *bw, const char *host,
 //		const char *realm, const char *fetchurl)
 static void create_login_window(nsurl *url, lwc_string *host,
-                const char *realm, nserror (*cb)(bool proceed, void *pw),
+                const char *realm, nserror (*cb)(
+                		const char *username,
+                		const char *password,
+                		void *pw),
                 void *cbpw)
 {
 	BString r("Secure Area");
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index f4229207b..49d049c28 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -655,23 +655,26 @@ void nsbeos_dispatch_event(BMessage *message)
 		{
 			nsurl* url;
 			BString realm;
-			BString auth;
+			BString username;
+			BString password;
 			void* cbpw;
-			nserror (*cb)(bool proceed, void* pw);
+			nserror (*cb)(const char *username,
+					const char *password,
+					void *pw);
 
 			if (message->FindPointer("URL", (void**)&url) < B_OK)
 				break;
 			if (message->FindString("Realm", &realm) < B_OK)
 				break;
-			if (message->FindString("Auth", &auth) < B_OK)
+			if (message->FindString("User", &username) < B_OK)
+				break;
+			if (message->FindString("Pass", &password) < B_OK)
 				break;
 			if (message->FindPointer("callback", (void**)&cb) < B_OK)
 				break;
 			if (message->FindPointer("callback_pw", (void**)&cbpw) < B_OK)
 				break;
-			//printf("login to '%s' with '%s'\n", url.String(), auth.String());
-			urldb_set_auth_details(url, realm.String(), auth.String());
-			cb(true, cbpw);
+			cb(username.String(), password.String(), cbpw);
 			break;
 		}
 		default:
-- 
cgit v1.2.3