function to write native credentials works now.

Author: d-w-moore

irods/__init__.py

@@ -3,6 +3,19 @@
 import logging
 import os
 
+def env_filename_from_keyword_args(kwargs):
+    try:
+        env_file = kwargs.pop('irods_env_file')
+    except KeyError:
+        try:
+            env_file = os.environ['IRODS_ENVIRONMENT_FILE']
+        except KeyError:
+            env_file = os.path.expanduser('~/.irods/irods_environment.json')
+    return env_file
+
+def derived_auth_filename(env_file):
+    return '' if not env_file else os.path.join(os.path.dirname(env_file),'.irodsA')
+
 # This has no effect if basicConfig() was previously called.
 logging.basicConfig()
 

irods/account.py

@@ -1,10 +1,11 @@
 import os
+from irods import derived_auth_filename
 
 class iRODSAccount(object):
 
     @property
     def derived_auth_file(self):
-        return '' if not self.env_file else os.path.join(os.path.dirname(self.env_file),'.irodsA')
+        return derived_auth_filename(self.env_file)
 
     def __init__(self, irods_host, irods_port, irods_user_name, irods_zone_name,
                  irods_authentication_scheme='native',

irods/client_init.py

@@ -1,16 +1,17 @@
+from irods import (env_filename_from_keyword_args, derived_auth_filename)
 import irods.client_configuration as cfg
 import irods.password_obfuscation as obf
 import irods.helpers as h
 import getpass
 import sys
 
-def write_native_credentials_to_secrets_file( password ):
-    s = h.make_session()
-    assert(not s.auth_file)
-    open(s.pool.account.derived_auth_file,'w').write(obf.encode(password))
+def write_native_credentials_to_secrets_file(password, **kw):
+    env_file = env_filename_from_keyword_args(kw)
+    auth_file = derived_auth_filename(env_file)
+    open(auth_file,'w').write(obf.encode(password))
     return True
 
-def write_pam_credentials_to_secrets_file( password ):
+def write_pam_credentials_to_secrets_file( password ,**kw):
     s = h.make_session()
     s.pool.account.password = password
     with cfg.loadlines( [dict(setting='legacy_auth.pam.password_for_auto_renew',value=None),

irods/test/helpers.py

@@ -21,6 +21,7 @@
 from irods.session import iRODSSession
 from irods.message import (iRODSMessage, IRODS_VERSION)
 from irods.password_obfuscation import encode
+from irods import env_filename_from_keyword_args
 from six.moves import range
 
 class iRODSUserLogins(object):
@@ -148,7 +149,6 @@ def recast(k):
     os.chmod(auth,0o600)
     return (config, auth)
 
-
 # Create a connection for test, based on ~/.irods environment by default.
 
 def make_session(test_server_version = True, **kwargs):
@@ -166,13 +166,7 @@ def make_session(test_server_version = True, **kwargs):
     **kwargs:            Keyword arguments.  Fed directly to the iRODSSession
                          constructor.  """
 
-    try:
-        env_file = kwargs.pop('irods_env_file')
-    except KeyError:
-        try:
-            env_file = os.environ['IRODS_ENVIRONMENT_FILE']
-        except KeyError:
-            env_file = os.path.expanduser('~/.irods/irods_environment.json')
+    env_file = env_filename_from_keyword_args( kwargs )
     session = iRODSSession( irods_env_file = env_file, **kwargs )
     if test_server_version:
         connected_version = session.server_version[:3]