Merge pull request #15 from kbase/dev-gradle

Remove lookup_globus_user method

Author: MrCreosote

RELEASE_NOTES.txt

@@ -2,9 +2,11 @@
 
 A lightweight service to store public KBase user profiles and related basic information.
 
-## VERSION: 0.2.2 (Released TDB)
+## VERSION: 0.3.0 (Released TDB)
 
 * Switched the build system from Make / Ant to Gradle
+* The `lookup_globus_user` method was removed.
+* The `globus-url` configuration parameter was removed.
 
 ## VERSION: 0.2.1 (Released 4/1/19)
 

UserProfile.spec

@@ -67,14 +67,5 @@ module UserProfile {
         todo: add some way to remove fields.  Fields in profile can only be modified or added.
     */
     funcdef update_user_profile(SetUserProfileParams p) returns () authentication required;
-
-
-	typedef structure {
-		string email;
-		string fullName;
-		string userName;
-	} GlobusUser;
-
-	funcdef lookup_globus_user(list <username> usernames) returns (mapping <username,GlobusUser> users) authentication required;
 };
 

deploy.cfg

@@ -37,5 +37,4 @@ min-memory = 1000
 #Maximum memory size in MB.
 max-memory = 2000
 
-auth-service-url = https://kbase.us/services/authorization
-globus-url =  https://nexus.api.globusonline.org
+auth-service-url = https://ci.kbase.us/services/auth/api/legacy/KBase/Sessions/Login

deployment/conf/.templates/deployment.cfg.templ

@@ -29,4 +29,3 @@ basedir={{ default .Env.basedir "user_profile" }}
 
 auth-service-url = {{ default .Env.auth_service_url "https://ci-kbase.us/services/authorization" }}
 auth-service-url-allow-insecure = {{ default .Env.auth_service_allow_insecure "false" }}
-globus-url =  {{ default .Env.globus_url "https://nexus.api.globusonline.org" }}

docshtml/UserProfile.html

@@ -597,98 +597,6 @@ todo: add some way to remove fields.  Fields in profile can only be modified or
     }
 }
 
-
-
-=head2 lookup_globus_user
-
-  $users = $obj->lookup_globus_user($usernames)
-
-=over 4
-
-=item Parameter and return types
-
-=begin html
-
-<pre>
-$usernames is a reference to a list where each element is an UserProfile.username
-$users is a reference to a hash where the key is an UserProfile.username and the value is an UserProfile.GlobusUser
-username is a string
-GlobusUser is a reference to a hash where the following keys are defined:
-	email has a value which is a string
-	fullName has a value which is a string
-	userName has a value which is a string
-
-</pre>
-
-=end html
-
-=begin text
-
-$usernames is a reference to a list where each element is an UserProfile.username
-$users is a reference to a hash where the key is an UserProfile.username and the value is an UserProfile.GlobusUser
-username is a string
-GlobusUser is a reference to a hash where the following keys are defined:
-	email has a value which is a string
-	fullName has a value which is a string
-	userName has a value which is a string
-
-
-=end text
-
-=item Description
-
-
-
-=back
-
-=cut
-
- sub lookup_globus_user
-{
-    my($self, @args) = @_;
-
-# Authentication: required
-
-    if ((my $n = @args) != 1)
-    {
-	Bio::KBase::Exceptions::ArgumentValidationError->throw(error =>
-							       "Invalid argument count for function lookup_globus_user (received $n, expecting 1)");
-    }
-    {
-	my($usernames) = @args;
-
-	my @_bad_arguments;
-        (ref($usernames) eq 'ARRAY') or push(@_bad_arguments, "Invalid type for argument 1 \"usernames\" (value was \"$usernames\")");
-        if (@_bad_arguments) {
-	    my $msg = "Invalid arguments passed to lookup_globus_user:\n" . join("", map { "\t$_\n" } @_bad_arguments);
-	    Bio::KBase::Exceptions::ArgumentValidationError->throw(error => $msg,
-								   method_name => 'lookup_globus_user');
-	}
-    }
-
-    my $url = $self->{url};
-    my $result = $self->{client}->call($url, $self->{headers}, {
-	    method => "UserProfile.lookup_globus_user",
-	    params => \@args,
-    });
-    if ($result) {
-	if ($result->is_error) {
-	    Bio::KBase::Exceptions::JSONRPC->throw(error => $result->error_message,
-					       code => $result->content->{error}->{code},
-					       method_name => 'lookup_globus_user',
-					       data => $result->content->{error}->{error} # JSON::RPC::ReturnObject only supports JSONRPC 1.1 or 1.O
-					      );
-	} else {
-	    return wantarray ? @{$result->result} : $result->result->[0];
-	}
-    } else {
-        Bio::KBase::Exceptions::HTTP->throw(error => "Error invoking method lookup_globus_user",
-					    status_line => $self->{client}->status_line,
-					    method_name => 'lookup_globus_user',
-				       );
-    }
-}
- 
 
 sub status
 {
@@ -732,16 +640,16 @@ sub version {
             Bio::KBase::Exceptions::JSONRPC->throw(
                 error => $result->error_message,
                 code => $result->content->{code},
-                method_name => 'lookup_globus_user',
+                method_name => 'update_user_profile',
             );
         } else {
             return wantarray ? @{$result->result} : $result->result->[0];
         }
     } else {
         Bio::KBase::Exceptions::HTTP->throw(
-            error => "Error invoking method lookup_globus_user",
+            error => "Error invoking method update_user_profile",
             status_line => $self->{client}->status_line,
-            method_name => 'lookup_globus_user',
+            method_name => 'update_user_profile',
         );
     }
 }
@@ -987,40 +895,6 @@ profile has a value which is an UserProfile.UserProfile
 
 
 
-=head2 GlobusUser
-
-=over 4
-
-
-
-=item Definition
-
-=begin html
-
-<pre>
-a reference to a hash where the following keys are defined:
-email has a value which is a string
-fullName has a value which is a string
-userName has a value which is a string
-
-</pre>
-
-=end html
-
-=begin text
-
-a reference to a hash where the following keys are defined:
-email has a value which is a string
-fullName has a value which is a string
-userName has a value which is a string
-
-
-=end text
-
-=back
-
-
-
 =cut
 
 package Bio::KBase::UserProfile::Client::RpcClient;

lib/Bio/KBase/UserProfile/Client.pm

@@ -102,16 +102,6 @@ def update_user_profile(self, p, context=None):
         return self._client.call_method('UserProfile.update_user_profile',
                                         [p], self._service_ver, context)
 
-    def lookup_globus_user(self, usernames, context=None):
-        """
-        :param usernames: instance of list of type "username"
-        :returns: instance of mapping from type "username" to type
-           "GlobusUser" -> structure: parameter "email" of String, parameter
-           "fullName" of String, parameter "userName" of String
-        """
-        return self._client.call_method('UserProfile.lookup_globus_user',
-                                        [usernames], self._service_ver, context)
-
     def status(self, context=None):
         return self._client.call_method('UserProfile.status',
                                         [], self._service_ver, context)

lib/biokbase/user_profile/client.py

@@ -84,19 +84,6 @@ function UserProfile(url, auth, auth_cb, timeout, async_job_check_time_ms, servi
         return json_call_ajax(_url, "UserProfile.update_user_profile",
             [p], 0, _callback, _errorCallback);
     };
- 
-     this.lookup_globus_user = function (usernames, _callback, _errorCallback) {
-        if (typeof usernames === 'function')
-            throw 'Argument usernames can not be a function';
-        if (_callback && typeof _callback !== 'function')
-            throw 'Argument _callback must be a function if defined';
-        if (_errorCallback && typeof _errorCallback !== 'function')
-            throw 'Argument _errorCallback must be a function if defined';
-        if (typeof arguments === 'function' && arguments.length > 1+2)
-            throw 'Too many arguments ('+arguments.length+' instead of '+(1+2)+')';
-        return json_call_ajax(_url, "UserProfile.lookup_globus_user",
-            [usernames], 1, _callback, _errorCallback);
-    };
 
     this.status = function (_callback, _errorCallback) {
         if (_callback && typeof _callback !== 'function')

lib/javascript/UserProfile/Client.js

@@ -292,23 +292,6 @@ public void updateUserProfile(SetUserProfileParams p, RpcContext... jsonRpcConte
         caller.jsonrpcCall("UserProfile.update_user_profile", args, retType, false, true, jsonRpcContext, this.serviceVersion);
     }
 
-    /**
-     * <p>Original spec-file function name: lookup_globus_user</p>
-     * <pre>
-     * </pre>
-     * @param   usernames   instance of list of original type "username"
-     * @return   parameter "users" of mapping from original type "username" to type {@link us.kbase.userprofile.GlobusUser GlobusUser}
-     * @throws IOException if an IO exception occurs
-     * @throws JsonClientException if a JSON RPC exception occurs
-     */
-    public Map<String,GlobusUser> lookupGlobusUser(List<String> usernames, RpcContext... jsonRpcContext) throws IOException, JsonClientException {
-        List<Object> args = new ArrayList<Object>();
-        args.add(usernames);
-        TypeReference<List<Map<String,GlobusUser>>> retType = new TypeReference<List<Map<String,GlobusUser>>>() {};
-        List<Map<String,GlobusUser>> res = caller.jsonrpcCall("UserProfile.lookup_globus_user", args, retType, true, true, jsonRpcContext, this.serviceVersion);
-        return res.get(0);
-    }
-
     public Map<String, Object> status(RpcContext... jsonRpcContext) throws IOException, JsonClientException {
         List<Object> args = new ArrayList<Object>();
         TypeReference<List<Map<String, Object>>> retType = new TypeReference<List<Map<String, Object>>>() {};