From 09d4d1f9073c5174cdc0785f211ded4f8bd461fa Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 6 Dec 2018 14:09:50 -0500 Subject: [PATCH] SPARK-1901 ServiceContext.login( existing token). --- .../api/Channels/QuickBusClientChannel.cs | 60 +++++++++---------- src/client/spark_api/api/ServiceContext.cs | 8 ++- src/lib/api/public/ServiceContext.cpp | 3 + src/lib/api/public/ServiceContext.h | 1 + 4 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 937ac10b8..c22bf583d 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -35,7 +35,7 @@ namespace bts.api.core { var header = new RequestHeader() { Method = method_id, RequestId = id, - Token = _context.token + Token = _context.token.HasValue ? new AuthToken() { Token = _context.token?.Token } : null }; var buffer = header.serialize(request); var tcs = new TaskCompletionSource>(); @@ -60,44 +60,44 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { IntPtr temp_subscription = IntPtr.Zero; - void unsubscribe_temp_sub() { - // Unsubscribe late to keep qb refcount > 0 continuously + void unsubscribe_temp_sub() { + // Unsubscribe late to keep qb refcount > 0 continuously if (temp_subscription != IntPtr.Zero) ApiNativeMethods.api_client_unsubscribe(_client, temp_subscription); } while (true) { - var response = await check_stream_access(method_id, qualifier); - if (response.success) { - if (response.value.Authorized) { - // success. Break loop and subscribe - break; - } - else { - // Not authorized. return empty stream - unsubscribe_temp_sub(); - observer.OnCompleted(); - return Disposable.Empty; - } - } - else { - // Wait for stream to fire once before trying again - unsubscribe_temp_sub(); - var tcs = new TaskCompletionSource(); - ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { - tcs.TrySetResult(true); - }; - temp_subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); - await tcs.Task; - GC.KeepAlive(cb); - } + var response = await check_stream_access(method_id, qualifier); + if (response.success) { + if (response.value.Authorized) { + // success. Break loop and subscribe + break; + } + else { + // Not authorized. return empty stream + unsubscribe_temp_sub(); + observer.OnCompleted(); + return Disposable.Empty; + } + } + else { + // Wait for stream to fire once before trying again + unsubscribe_temp_sub(); + var tcs = new TaskCompletionSource(); + ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + tcs.TrySetResult(true); + }; + temp_subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); + await tcs.Task; + GC.KeepAlive(cb); + } } // Authorized. Stream events - unsubscribe_temp_sub(); - return SubscribeNative(method, qualifier, parser, converter, observer); + unsubscribe_temp_sub(); + return SubscribeNative(method, qualifier, parser, converter, observer); }); return result; } - private Task> check_stream_access(int method_id, string qualifier) { + private Task> check_stream_access(int method_id, string qualifier) { var request = new StreamAccessRequest() { Qualifier = qualifier ?? "" }; return send(method_id, request); } diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 3f2ce048e..978b85957 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -10,6 +10,7 @@ namespace bts.api.core { public class ServiceContext : IDisposable { IntPtr _qbus; + AuthToken _token; public ServiceContext() { _qbus = ApiNativeMethods.api_create_quickbus(null, 0); @@ -31,7 +32,7 @@ namespace bts.api.core { return ch; } - public AuthToken token { get; private set; } + public AuthTokenImmutable? token => _token; public string user { get; private set; } public async Task login(string username, string password) { @@ -41,12 +42,15 @@ namespace bts.api.core { Password = password }); if (result.success) { - token = result.value.Token; + _token = result.value.Token; user = username; return true; } return false; } + public void login(AuthTokenImmutable token) { + this._token = token.CloneToMutable(); + } #region IDisposable Support diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index 3fafa77f0..26c333f34 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -54,6 +54,9 @@ bool ServiceContext::login(const std::string& username, const std::string& passw } return false; } +void ServiceContext::login(const AuthToken& token) { + _self->_token = token; +} void ServiceContext::post(const Action& action, uint64_t delay) { api_post(_self->_qbus, action, delay); diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index e434affe1..be886666d 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -36,6 +36,7 @@ public: const AuthToken token() const; const std::string& user() const; bool login(const std::string& username, const std::string& password); + void login(const AuthToken& token); typedef std::function Action; void post(const Action&, uint64_t delayms=0);