Fixed a binding naming conventions and order of arguments to reflect the Java interface. Added support for brokered and direct environments for binding based on sourceName and applicationKey/sessionToken respectively.

Jon Nicholson · Jon Nicholson · commit 7bef7173d8d3 · 2016-07-11T13:59:12.000+01:00
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Infrastructure/SifObjectBinding.cs b/Code/Sif3Framework/Sif.Framework/Model/Infrastructure/SifObjectBinding.cs
@@ -6,10 +6,19 @@ namespace Sif.Framework.Model.Infrastructure
 {
     class SifObjectBinding : IPersistable<long>, ISifRefId<Guid>
     {
+        /// <summary>
+        /// Internal identifier used by hibernate. Do not use/alter this.
+        /// </summary>
         public virtual long Id { get; set; }
 
+        /// <summary>
+        /// The ref id of the object to be bound
+        /// </summary>
         public virtual Guid RefId { get; set; }
 
-        public virtual string SessionToken { get; set; }
+        /// <summary>
+        /// The id of the owner of the object (application key, source id, etc.)
+        /// </summary>
+        public virtual string OwnerId { get; set; }
     }
 }
diff --git a/Code/Sif3Framework/Sif.Framework/Persistence/NHibernate/Mapping/SifObjectBinding.hbm.xml b/Code/Sif3Framework/Sif.Framework/Persistence/NHibernate/Mapping/SifObjectBinding.hbm.xml
@@ -4,7 +4,7 @@
     <id name="Id" column="SIF_OBJECT_BINDING_ID">
       <generator class="native"/>
     </id>
-    <property name="RefId" column="SIF_ID" length="64"/>
-    <property name="SessionToken" column="SESSION_TOKEN" length="64"/>
+    <property name="RefId" column="REF_ID" length="200"/>
+    <property name="OwnerId" column="OWNER_ID" length="200"/>
   </class>
 </hibernate-mapping>
diff --git a/Code/Sif3Framework/Sif.Framework/Providers/FunctionalServiceProvider.cs b/Code/Sif3Framework/Sif.Framework/Providers/FunctionalServiceProvider.cs
@@ -106,7 +106,7 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromUri]
 
                 if (SettingsManager.ProviderSettings.JobBinding)
                 {
-                    service.Bind(getOwnerId(sessionToken), id);
+                    service.Bind(id, getOwnerId(sessionToken));
                 }
 
                 jobType job = service.Retrieve(id, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]));
@@ -170,7 +170,7 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromBody]
 
                         if (SettingsManager.ProviderSettings.JobBinding)
                         {
-                            service.Bind(getOwnerId(sessionToken), id);
+                            service.Bind(id, getOwnerId(sessionToken));
                         }
 
                         creates.Add(ProviderUtils.CreateCreate(HttpStatusCode.Created, id.ToString(), job.id));
@@ -245,7 +245,7 @@ public virtual ICollection<jobType> Get([FromUri] string serviceName, [MatrixPar
                 foreach (jobType job in jobs)
                 {
                     if (!SettingsManager.ProviderSettings.JobBinding
-                        || service.IsBound(getOwnerId(sessionToken), Guid.Parse(job.id)))
+                        || service.IsBound(Guid.Parse(job.id), getOwnerId(sessionToken)))
                     {
                         items.Add(job);
                     }
@@ -284,7 +284,7 @@ public virtual HttpResponseMessage Get([FromUri] string serviceName, [FromUri] G
                 item = service.Retrieve(id, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]));
 
                 if (SettingsManager.ProviderSettings.JobBinding
-                    && !service.IsBound(getOwnerId(sessionToken), Guid.Parse(item.id)))
+                    && !service.IsBound(Guid.Parse(item.id), getOwnerId(sessionToken)))
                 {
                     throw new InvalidSessionException("Request failed as one or more jobs referred to in this request do not belong to this consumer.");
                 }
@@ -344,7 +344,7 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromUri
                 IFunctionalService service = getService(serviceName);
 
                 if (SettingsManager.ProviderSettings.JobBinding
-                    && !service.IsBound(getOwnerId(sessionToken), id))
+                    && !service.IsBound(id, getOwnerId(sessionToken)))
                 {
                     throw new InvalidSessionException("Request failed as one or more jobs referred to in this request do not belong to this consumer.");
                 }
@@ -384,9 +384,9 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromBod
                 try
                 {
                     if (SettingsManager.ProviderSettings.JobBinding
-                        && !service.IsBound(getOwnerId(sessionToken), Guid.Parse(deleteId.id)))
+                        && !service.IsBound(Guid.Parse(deleteId.id), getOwnerId(sessionToken)))
                     {
-                        throw new InvalidSessionException("Request failed as one or more jobs referred to in this request do not belong to this consumer.");
+                        throw new InvalidSessionException("Request failed as job does not belong to this consumer.");
                     }
 
                     service.Delete(Guid.Parse(deleteId.id), zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]));
@@ -412,7 +412,7 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromBod
                 }
                 catch (InvalidSessionException e)
                 {
-                    statuses.Add(ProviderUtils.CreateDelete(HttpStatusCode.BadRequest, deleteId.id, ProviderUtils.CreateError(HttpStatusCode.BadRequest, serviceName, "Request failed for object " + serviceName + " with ID of " + deleteId.id + ".\n " + e.Message)));
+                    statuses.Add(ProviderUtils.CreateDelete(HttpStatusCode.BadRequest, deleteId.id, ProviderUtils.CreateError(HttpStatusCode.BadRequest, serviceName, "Request failed for object " + serviceName + " with ID of " + deleteId.id + ", job doesn't belong to this consumer.\n " + e.Message)));
                 }
                 catch (Exception e)
                 {
@@ -444,11 +444,11 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromUri]
             {
                 IFunctionalService service = getService(serviceName);
                 if (SettingsManager.ProviderSettings.JobBinding
-                    && !service.IsBound(getOwnerId(sessionToken), id))
+                    && !service.IsBound(id, getOwnerId(sessionToken)))
                 {
                     throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");
                 }
-                return OKResult(service.CreateToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.getContentType(Request), accept: HttpUtils.GetAccept(Request)));
+                return OKResult(service.CreateToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
             }
             catch (ArgumentException e)
             {
@@ -485,11 +485,11 @@ public virtual HttpResponseMessage Get([FromUri] string serviceName, [FromUri] G
             {
                 IFunctionalService service = getService(serviceName);
                 if (SettingsManager.ProviderSettings.JobBinding
-                    && !service.IsBound(getOwnerId(sessionToken), id))
+                    && !service.IsBound(id, getOwnerId(sessionToken)))
                 {
                     throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");
                 }
-                return OKResult(service.RetrieveToPhase(id, phaseName, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.getContentType(Request), accept: HttpUtils.GetAccept(Request)));
+                return OKResult(service.RetrieveToPhase(id, phaseName, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
             }
             catch (ArgumentException e)
             {
@@ -524,11 +524,11 @@ public virtual HttpResponseMessage Put([FromUri] string serviceName, [FromUri] G
             {
                 IFunctionalService service = getService(serviceName);
                 if (SettingsManager.ProviderSettings.JobBinding
-                    && !service.IsBound(getOwnerId(sessionToken), id))
+                    && !service.IsBound(id, getOwnerId(sessionToken)))
                 {
                     throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");
                 }
-                return OKResult(service.UpdateToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.getContentType(Request), accept: HttpUtils.GetAccept(Request)));
+                return OKResult(service.UpdateToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
             }
             catch (ArgumentException e)
             {
@@ -565,11 +565,11 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromUri
             {
                 IFunctionalService service = getService(serviceName);
                 if (SettingsManager.ProviderSettings.JobBinding
-                    && !service.IsBound(getOwnerId(sessionToken), id))
+                    && !service.IsBound(id, getOwnerId(sessionToken)))
                 {
                     throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");
                 }
-                return OKResult(service.DeleteToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.getContentType(Request), accept: HttpUtils.GetAccept(Request)));
+                return OKResult(service.DeleteToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
             }
             catch (ArgumentException e)
             {
@@ -609,7 +609,7 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromUri]
             {
                 IFunctionalService service = getService(serviceName);
                 if (SettingsManager.ProviderSettings.JobBinding
-                    && !service.IsBound(getOwnerId(sessionToken), id))
+                    && !service.IsBound(id, getOwnerId(sessionToken)))
                 {
                     throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");
                 }
@@ -787,7 +787,25 @@ protected HttpResponseMessage OKResult(string payload = null)
 
         private String getOwnerId(String sessionToken)
         {
-            return sessionToken;
+            String ownerId = null;
+
+            switch (SettingsManager.ProviderSettings.EnvironmentType)
+            {
+                case EnvironmentType.DIRECT:
+                    // Application key is either in header or in session token
+                    ownerId = HttpUtils.GetApplicationKey(Request.Headers) ?? sessionToken;
+                    break;
+                case EnvironmentType.BROKERED:
+                    // Application key must have been moved into sourceName property
+                    ownerId = HttpUtils.GetSourceName(Request.Headers);
+                    break;
+            }
+
+            if (ownerId == null)
+            {
+                throw new NotFoundException("Could not identify consumer.");
+            }
+            return ownerId;
         }
     }
 
diff --git a/Code/Sif3Framework/Sif.Framework/Service/Functional/FunctionalService.cs b/Code/Sif3Framework/Sif.Framework/Service/Functional/FunctionalService.cs
@@ -79,28 +79,28 @@ public virtual void Shutdown()
         }
 
         /// <summary>
-        /// <see cref="IFunctionalService.Bind(string, Guid)"/>
+        /// <see cref="IFunctionalService.Bind(Guid, string)"/>
         /// </summary>
-        public virtual void Bind(string sessionToken, Guid objectId)
+        public virtual void Bind(Guid objectId, string ownerId)
         {
             long id = bindings.Save(new SifObjectBinding()
             {
-                SessionToken = sessionToken,
+                OwnerId = ownerId,
                 RefId = objectId
             });
-            log.Info("Bound object " + objectId + " with session token " + sessionToken + ". ID = " + id);
+            log.Info("Bound object " + objectId + " with session token " + ownerId + ". ID = " + id);
         }
 
         /// <summary>
         /// <see cref="IFunctionalService.Unbind(string)"/>
         /// </summary>
-        public virtual void Unbind(string sessionToken)
+        public virtual void Unbind(string ownerId)
         {
             bindings.Delete(bindings.Retrieve(new SifObjectBinding()
             {
-                SessionToken = sessionToken
+                OwnerId = ownerId
             }));
-            log.Info("Unbound all objects from the session token " + sessionToken);
+            log.Info("Unbound all objects from the session token " + ownerId);
         }
 
         /// <summary>
@@ -129,29 +129,29 @@ public virtual string GetBinding(Guid objectId)
                 log.Debug("Could not find any bindings for the object " + objectId + ".");
                 return null;
             }
-            string sessionToken = candidates.FirstOrDefault().SessionToken;
+            string sessionToken = candidates.FirstOrDefault().OwnerId;
             log.Info("Binding for object " + objectId + " is session token " + sessionToken + ".");
             return sessionToken;
         }
 
         /// <summary>
-        /// <see cref="IFunctionalService.IsBound(string, Guid)"/>
+        /// <see cref="IFunctionalService.IsBound(Guid, string)"/>
         /// </summary>
-        public virtual Boolean IsBound(string sessionToken, Guid objectId)
+        public virtual Boolean IsBound(Guid objectId, string ownerId)
         {
             ICollection<SifObjectBinding> candidates = bindings.Retrieve(new SifObjectBinding()
             {
-                SessionToken = sessionToken,
+                OwnerId = ownerId,
                 RefId = objectId
             });
             Boolean bound = candidates != null && candidates.Count > 0;
             if (bound)
             {
-                log.Info("Found binding for object " + objectId + " with session token " + sessionToken + ".");
+                log.Info("Found binding for object " + objectId + " with session token " + ownerId + ".");
             }
             else
             {
-                log.Debug("Cound not find binding for object " + objectId + " with session token " + sessionToken + ".");
+                log.Debug("Cound not find binding for object " + objectId + " with session token " + ownerId + ".");
             }
             return bound;
         }
diff --git a/Code/Sif3Framework/Sif.Framework/Service/Functional/IFunctionalService.cs b/Code/Sif3Framework/Sif.Framework/Service/Functional/IFunctionalService.cs
@@ -108,15 +108,15 @@ public interface IFunctionalService : ISifService<jobType, Job>
         /// <summary>
         /// Binds a (job) object's refid to a session token
         /// </summary>
-        /// <param name="sessionToken">The session token the (job) object was created in</param>
+        /// <param name="ownerId">The session token the (job) object was created in</param>
         /// <param name="objectId">The refid of the created object</param>
-        void Bind(string sessionToken, Guid objectId);
+        void Bind(Guid objectId, string ownerId);
 
         /// <summary>
         /// Unbinds all (job) object refid from this session token
         /// </summary>
-        /// <param name="sessionToken">The session token to unbind all objects from</param>
-        void Unbind(string sessionToken);
+        /// <param name="ownerId">The session token to unbind all objects from</param>
+        void Unbind(string ownerId);
 
         /// <summary>
         /// Unbinds the (job) object's refid from its associated session token
@@ -134,9 +134,9 @@ public interface IFunctionalService : ISifService<jobType, Job>
         /// <summary>
         /// Returns true if the (job) object refid is associated with the session token.
         /// </summary>
-        /// <param name="sessionToken">The session token to look for</param>
+        /// <param name="ownerId">The session token to look for</param>
         /// <param name="objectId">The refid of the (job) object to look for</param>
         /// <returns>See summary</returns>
-        Boolean IsBound(string sessionToken, Guid objectId);
+        Boolean IsBound(Guid objectId, string ownerId);
     }
 }
diff --git a/Code/Sif3Framework/Sif.Framework/Utils/HttpUtils.cs b/Code/Sif3Framework/Sif.Framework/Utils/HttpUtils.cs
@@ -44,13 +44,11 @@ enum RequestHeader
             methodOverrideSif,
             mustUseAdvisory,
             navigationPage,
-            navigationPageSize
+            navigationPageSize,
+            applicationKey,
+            sourceName
         }
 
-        /*
-        public static readonly string JobIdHeader = "jobId";
-        */
-
         /// <summary>
         /// 
         /// </summary>
@@ -198,7 +196,7 @@ public static string DeleteRequest(string url, string authorisationToken, string
 
         public static string DeleteRequest(string url, string authorisationToken, string body, string contentTypeOverride = null, string acceptOverride = null)
         {
-            return RequestWithPayload(RequestMethod.DELETE, url, authorisationToken, body,  contentTypeOverride, acceptOverride);
+            return RequestWithPayload(RequestMethod.DELETE, url, authorisationToken, body, contentTypeOverride, acceptOverride);
         }
 
         /// <summary>
@@ -480,6 +478,49 @@ internal static bool ValidatePagingParameters(HttpHeaders headers, out string er
             return string.IsNullOrWhiteSpace(errorMessage);
         }
 
+        /// <summary>
+        /// Retrieve the applicationKey property from the header.
+        /// </summary>
+        /// <param name="headers">Request headers.</param>
+        /// <returns>applicationKey value if set; null otherwise.</returns>
+        internal static string GetApplicationKey(HttpHeaders headers)
+        {
+            return GetHeaderValue(headers, RequestHeader.applicationKey.ToDescription());
+        }
+
+        /// <summary>
+        /// Retrieve the sourceName property from the header.
+        /// </summary>
+        /// <param name="headers">Request headers.</param>
+        /// <returns>sourceName value if set; null otherwise.</returns>
+        internal static string GetSourceName(HttpHeaders headers)
+        {
+            return GetHeaderValue(headers, RequestHeader.sourceName.ToDescription());
+        }
+
+        /// <summary>
+        /// Gets the content type from the request headers.
+        /// </summary>
+        /// <param name="Request">HTTP Request</param>
+        public static string GetContentType(HttpRequestMessage Request)
+        {
+            return Request.Content.Headers.ContentType.MediaType;
+        }
+
+        /// <summary>
+        /// Gets the accept type from the request headers.
+        /// </summary>
+        /// <param name="Request">HTTP Request</param>
+        public static string GetAccept(HttpRequestMessage Request)
+        {
+            string[] values = (from a in Request.Headers.Accept select a.MediaType).ToArray();
+            if (values == null || values.Length == 0)
+            {
+                return "plain/text";
+            }
+            return values[0];
+        }
+
         /// <summary>
         /// Build up a string of Matrix Parameters based upon the passed parameters.
         /// </summary>
@@ -502,22 +543,5 @@ public static string MatrixParameters(string zone = null, string context = null)
 
             return matrixParameters;
         }
-
-        public static string GetAccept(HttpRequestMessage Request)
-        {
-            string[] values = (from a in Request.Headers.Accept select a.MediaType).ToArray();
-            if(values == null || values.Length == 0)
-            {
-                return "plain/text";
-            }
-            return values[0];
-        }
-
-        public static string getContentType(HttpRequestMessage Request)
-        {
-            return Request.Content.Headers.ContentType.MediaType;
-        }
-        
     }
-
 }
diff --git a/Data/Databases/SQLite/SifFrameworkDatabase.db b/Data/Databases/SQLite/SifFrameworkDatabase.db
diff --git a/SharedLibs/Sif.Framework 2.0.0/Sif.Framework.dll b/SharedLibs/Sif.Framework 2.0.0/Sif.Framework.dll

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,19 @@ namespace Sif.Framework.Model.Infrastructure`
`6`	`6`	`{`
`7`	`7`	`class SifObjectBinding : IPersistable<long>, ISifRefId<Guid>`
`8`	`8`	`{`
	`9`	`+ /// <summary>`
	`10`	`+ /// Internal identifier used by hibernate. Do not use/alter this.`
	`11`	`+ /// </summary>`
`9`	`12`	`public virtual long Id { get; set; }`
`10`	`13`
	`14`	`+ /// <summary>`
	`15`	`+ /// The ref id of the object to be bound`
	`16`	`+ /// </summary>`
`11`	`17`	`public virtual Guid RefId { get; set; }`
`12`	`18`
`13`		`- public virtual string SessionToken { get; set; }`
	`19`	`+ /// <summary>`
	`20`	`+ /// The id of the owner of the object (application key, source id, etc.)`
	`21`	`+ /// </summary>`
	`22`	`+ public virtual string OwnerId { get; set; }`
`14`	`23`	`}`
`15`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromUri]`
`106`	`106`
`107`	`107`	`if (SettingsManager.ProviderSettings.JobBinding)`
`108`	`108`	`{`
`109`		`- service.Bind(getOwnerId(sessionToken), id);`
	`109`	`+ service.Bind(id, getOwnerId(sessionToken));`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`jobType job = service.Retrieve(id, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]));`
`@@ -170,7 +170,7 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromBody]`
`170`	`170`
`171`	`171`	`if (SettingsManager.ProviderSettings.JobBinding)`
`172`	`172`	`{`
`173`		`- service.Bind(getOwnerId(sessionToken), id);`
	`173`	`+ service.Bind(id, getOwnerId(sessionToken));`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`creates.Add(ProviderUtils.CreateCreate(HttpStatusCode.Created, id.ToString(), job.id));`
`@@ -245,7 +245,7 @@ public virtual ICollection<jobType> Get([FromUri] string serviceName, [MatrixPar`
`245`	`245`	`foreach (jobType job in jobs)`
`246`	`246`	`{`
`247`	`247`	`if (!SettingsManager.ProviderSettings.JobBinding`
`248`		`- \|\| service.IsBound(getOwnerId(sessionToken), Guid.Parse(job.id)))`
	`248`	`+ \|\| service.IsBound(Guid.Parse(job.id), getOwnerId(sessionToken)))`
`249`	`249`	`{`
`250`	`250`	`items.Add(job);`
`251`	`251`	`}`
`@@ -284,7 +284,7 @@ public virtual HttpResponseMessage Get([FromUri] string serviceName, [FromUri] G`
`284`	`284`	`item = service.Retrieve(id, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]));`
`285`	`285`
`286`	`286`	`if (SettingsManager.ProviderSettings.JobBinding`
`287`		`- && !service.IsBound(getOwnerId(sessionToken), Guid.Parse(item.id)))`
	`287`	`+ && !service.IsBound(Guid.Parse(item.id), getOwnerId(sessionToken)))`
`288`	`288`	`{`
`289`	`289`	`throw new InvalidSessionException("Request failed as one or more jobs referred to in this request do not belong to this consumer.");`
`290`	`290`	`}`
`@@ -344,7 +344,7 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromUri`
`344`	`344`	`IFunctionalService service = getService(serviceName);`
`345`	`345`
`346`	`346`	`if (SettingsManager.ProviderSettings.JobBinding`
`347`		`- && !service.IsBound(getOwnerId(sessionToken), id))`
	`347`	`+ && !service.IsBound(id, getOwnerId(sessionToken)))`
`348`	`348`	`{`
`349`	`349`	`throw new InvalidSessionException("Request failed as one or more jobs referred to in this request do not belong to this consumer.");`
`350`	`350`	`}`
`@@ -384,9 +384,9 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromBod`
`384`	`384`	`try`
`385`	`385`	`{`
`386`	`386`	`if (SettingsManager.ProviderSettings.JobBinding`
`387`		`- && !service.IsBound(getOwnerId(sessionToken), Guid.Parse(deleteId.id)))`
	`387`	`+ && !service.IsBound(Guid.Parse(deleteId.id), getOwnerId(sessionToken)))`
`388`	`388`	`{`
`389`		`- throw new InvalidSessionException("Request failed as one or more jobs referred to in this request do not belong to this consumer.");`
	`389`	`+ throw new InvalidSessionException("Request failed as job does not belong to this consumer.");`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`service.Delete(Guid.Parse(deleteId.id), zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]));`
`@@ -412,7 +412,7 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromBod`
`412`	`412`	`}`
`413`	`413`	`catch (InvalidSessionException e)`
`414`	`414`	`{`
`415`		`- statuses.Add(ProviderUtils.CreateDelete(HttpStatusCode.BadRequest, deleteId.id, ProviderUtils.CreateError(HttpStatusCode.BadRequest, serviceName, "Request failed for object " + serviceName + " with ID of " + deleteId.id + ".\n " + e.Message)));`
	`415`	`+ statuses.Add(ProviderUtils.CreateDelete(HttpStatusCode.BadRequest, deleteId.id, ProviderUtils.CreateError(HttpStatusCode.BadRequest, serviceName, "Request failed for object " + serviceName + " with ID of " + deleteId.id + ", job doesn't belong to this consumer.\n " + e.Message)));`
`416`	`416`	`}`
`417`	`417`	`catch (Exception e)`
`418`	`418`	`{`
`@@ -444,11 +444,11 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromUri]`
`444`	`444`	`{`
`445`	`445`	`IFunctionalService service = getService(serviceName);`
`446`	`446`	`if (SettingsManager.ProviderSettings.JobBinding`
`447`		`- && !service.IsBound(getOwnerId(sessionToken), id))`
	`447`	`+ && !service.IsBound(id, getOwnerId(sessionToken)))`
`448`	`448`	`{`
`449`	`449`	`throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");`
`450`	`450`	`}`
`451`		`- return OKResult(service.CreateToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.getContentType(Request), accept: HttpUtils.GetAccept(Request)));`
	`451`	`+ return OKResult(service.CreateToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));`
`452`	`452`	`}`
`453`	`453`	`catch (ArgumentException e)`
`454`	`454`	`{`
`@@ -485,11 +485,11 @@ public virtual HttpResponseMessage Get([FromUri] string serviceName, [FromUri] G`
`485`	`485`	`{`
`486`	`486`	`IFunctionalService service = getService(serviceName);`
`487`	`487`	`if (SettingsManager.ProviderSettings.JobBinding`
`488`		`- && !service.IsBound(getOwnerId(sessionToken), id))`
	`488`	`+ && !service.IsBound(id, getOwnerId(sessionToken)))`
`489`	`489`	`{`
`490`	`490`	`throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");`
`491`	`491`	`}`
`492`		`- return OKResult(service.RetrieveToPhase(id, phaseName, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.getContentType(Request), accept: HttpUtils.GetAccept(Request)));`
	`492`	`+ return OKResult(service.RetrieveToPhase(id, phaseName, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));`
`493`	`493`	`}`
`494`	`494`	`catch (ArgumentException e)`
`495`	`495`	`{`
`@@ -524,11 +524,11 @@ public virtual HttpResponseMessage Put([FromUri] string serviceName, [FromUri] G`
`524`	`524`	`{`
`525`	`525`	`IFunctionalService service = getService(serviceName);`
`526`	`526`	`if (SettingsManager.ProviderSettings.JobBinding`
`527`		`- && !service.IsBound(getOwnerId(sessionToken), id))`
	`527`	`+ && !service.IsBound(id, getOwnerId(sessionToken)))`
`528`	`528`	`{`
`529`	`529`	`throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");`
`530`	`530`	`}`
`531`		`- return OKResult(service.UpdateToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.getContentType(Request), accept: HttpUtils.GetAccept(Request)));`
	`531`	`+ return OKResult(service.UpdateToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));`
`532`	`532`	`}`
`533`	`533`	`catch (ArgumentException e)`
`534`	`534`	`{`
`@@ -565,11 +565,11 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromUri`
`565`	`565`	`{`
`566`	`566`	`IFunctionalService service = getService(serviceName);`
`567`	`567`	`if (SettingsManager.ProviderSettings.JobBinding`
`568`		`- && !service.IsBound(getOwnerId(sessionToken), id))`
	`568`	`+ && !service.IsBound(id, getOwnerId(sessionToken)))`
`569`	`569`	`{`
`570`	`570`	`throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");`
`571`	`571`	`}`
`572`		`- return OKResult(service.DeleteToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.getContentType(Request), accept: HttpUtils.GetAccept(Request)));`
	`572`	`+ return OKResult(service.DeleteToPhase(id, phaseName, body, zone: (zone == null ? null : zone[0]), context: (context == null ? null : context[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));`
`573`	`573`	`}`
`574`	`574`	`catch (ArgumentException e)`
`575`	`575`	`{`
`@@ -609,7 +609,7 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromUri]`
`609`	`609`	`{`
`610`	`610`	`IFunctionalService service = getService(serviceName);`
`611`	`611`	`if (SettingsManager.ProviderSettings.JobBinding`
`612`		`- && !service.IsBound(getOwnerId(sessionToken), id))`
	`612`	`+ && !service.IsBound(id, getOwnerId(sessionToken)))`
`613`	`613`	`{`
`614`	`614`	`throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");`
`615`	`615`	`}`
`@@ -787,7 +787,25 @@ protected HttpResponseMessage OKResult(string payload = null)`
`787`	`787`
`788`	`788`	`private String getOwnerId(String sessionToken)`
`789`	`789`	`{`
`790`		`- return sessionToken;`
	`790`	`+ String ownerId = null;`
	`791`	`+`
	`792`	`+ switch (SettingsManager.ProviderSettings.EnvironmentType)`
	`793`	`+ {`
	`794`	`+ case EnvironmentType.DIRECT:`
	`795`	`+ // Application key is either in header or in session token`
	`796`	`+ ownerId = HttpUtils.GetApplicationKey(Request.Headers) ?? sessionToken;`
	`797`	`+ break;`
	`798`	`+ case EnvironmentType.BROKERED:`
	`799`	`+ // Application key must have been moved into sourceName property`
	`800`	`+ ownerId = HttpUtils.GetSourceName(Request.Headers);`
	`801`	`+ break;`
	`802`	`+ }`
	`803`	`+`
	`804`	`+ if (ownerId == null)`
	`805`	`+ {`
	`806`	`+ throw new NotFoundException("Could not identify consumer.");`
	`807`	`+ }`
	`808`	`+ return ownerId;`
`791`	`809`	`}`
`792`	`810`	`}`
`793`	`811`
Original file line number	Diff line number	Diff line change
`@@ -79,28 +79,28 @@ public virtual void Shutdown()`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/// <summary>`
`82`		`- /// <see cref="IFunctionalService.Bind(string, Guid)"/>`
	`82`	`+ /// <see cref="IFunctionalService.Bind(Guid, string)"/>`
`83`	`83`	`/// </summary>`
`84`		`- public virtual void Bind(string sessionToken, Guid objectId)`
	`84`	`+ public virtual void Bind(Guid objectId, string ownerId)`
`85`	`85`	`{`
`86`	`86`	`long id = bindings.Save(new SifObjectBinding()`
`87`	`87`	`{`
`88`		`- SessionToken = sessionToken,`
	`88`	`+ OwnerId = ownerId,`
`89`	`89`	`RefId = objectId`
`90`	`90`	`});`
`91`		`- log.Info("Bound object " + objectId + " with session token " + sessionToken + ". ID = " + id);`
	`91`	`+ log.Info("Bound object " + objectId + " with session token " + ownerId + ". ID = " + id);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/// <summary>`
`95`	`95`	`/// <see cref="IFunctionalService.Unbind(string)"/>`
`96`	`96`	`/// </summary>`
`97`		`- public virtual void Unbind(string sessionToken)`
	`97`	`+ public virtual void Unbind(string ownerId)`
`98`	`98`	`{`
`99`	`99`	`bindings.Delete(bindings.Retrieve(new SifObjectBinding()`
`100`	`100`	`{`
`101`		`- SessionToken = sessionToken`
	`101`	`+ OwnerId = ownerId`
`102`	`102`	`}));`
`103`		`- log.Info("Unbound all objects from the session token " + sessionToken);`
	`103`	`+ log.Info("Unbound all objects from the session token " + ownerId);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/// <summary>`
`@@ -129,29 +129,29 @@ public virtual string GetBinding(Guid objectId)`
`129`	`129`	`log.Debug("Could not find any bindings for the object " + objectId + ".");`
`130`	`130`	`return null;`
`131`	`131`	`}`
`132`		`- string sessionToken = candidates.FirstOrDefault().SessionToken;`
	`132`	`+ string sessionToken = candidates.FirstOrDefault().OwnerId;`
`133`	`133`	`log.Info("Binding for object " + objectId + " is session token " + sessionToken + ".");`
`134`	`134`	`return sessionToken;`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`/// <summary>`
`138`		`- /// <see cref="IFunctionalService.IsBound(string, Guid)"/>`
	`138`	`+ /// <see cref="IFunctionalService.IsBound(Guid, string)"/>`
`139`	`139`	`/// </summary>`
`140`		`- public virtual Boolean IsBound(string sessionToken, Guid objectId)`
	`140`	`+ public virtual Boolean IsBound(Guid objectId, string ownerId)`
`141`	`141`	`{`
`142`	`142`	`ICollection<SifObjectBinding> candidates = bindings.Retrieve(new SifObjectBinding()`
`143`	`143`	`{`
`144`		`- SessionToken = sessionToken,`
	`144`	`+ OwnerId = ownerId,`
`145`	`145`	`RefId = objectId`
`146`	`146`	`});`
`147`	`147`	`Boolean bound = candidates != null && candidates.Count > 0;`
`148`	`148`	`if (bound)`
`149`	`149`	`{`
`150`		`- log.Info("Found binding for object " + objectId + " with session token " + sessionToken + ".");`
	`150`	`+ log.Info("Found binding for object " + objectId + " with session token " + ownerId + ".");`
`151`	`151`	`}`
`152`	`152`	`else`
`153`	`153`	`{`
`154`		`- log.Debug("Cound not find binding for object " + objectId + " with session token " + sessionToken + ".");`
	`154`	`+ log.Debug("Cound not find binding for object " + objectId + " with session token " + ownerId + ".");`
`155`	`155`	`}`
`156`	`156`	`return bound;`
`157`	`157`	`}`