             default:
                 failure?(nil, RequestError.InvalidRequest, 0)
             } // organization info request
-        } else if url.absoluteString == "http://dev.patronage2017.intive-projects.com/organization/info" {
+        } else if url.absoluteString == url.path {
             switch method {
             case .GET:
                 path = Bundle.main.path(forResource: "GetOrganizationInfo", ofType: "json")

                              params: [String : Any]?,
                              headers: [String : String]?,
                              success: ((Data?) -> Void)?,
                              failure: ((Data?, RequestError, Int) -> Void)?) {
        var jsonObj: NSData?
        var path: String?
        // News request
        if url.absoluteString == "http://dev.patronage2017.intive-projects.com/news?shortened=false" ||
            url.absoluteString == "http://dev.patronage2017.intive-projects.com/news?shortened=true" {
            switch method {
            case .GET:
                path = Bundle.main.path(forResource: "GetNews", ofType: "json")

        if let path = path {
            jsonObj = try? NSData(contentsOfFile: path, options: NSData.ReadingOptions.mappedIfSafe)
        }
    }
}
