mc5-api-client 1.0.9__py3-none-any.whl → 1.0.11__py3-none-any.whl

mc5_api_client/__init__.py

@@ -13,7 +13,9 @@ Provides easy access to authentication, profile management, clan operations,
 messaging, and more.
 """
 
-__version__ = "1.0.9"
+from typing import Optional, Dict, Any
+
+__version__ = "1.0.11"
 __author__ = "Chizoba"
 __email__ = "chizoba2026@hotmail.com"
 __license__ = "MIT"
@@ -38,6 +40,57 @@ from .admin_client import (
     quick_update_player_score
 )
 
+# Encrypted token convenience functions
+from .auth import TokenGenerator
+
+def quick_generate_encrypted_token(
+    username: str,
+    password: str,
+    device_id: Optional[str] = None,
+    scope: str = "alert auth chat leaderboard_ro lobby message session social config storage_ro tracking_bi feed storage leaderboard_admin social_eve social soc transaction schedule lottery voice matchmaker",
+    nonce: str = "*"
+) -> Dict[str, Any]:
+    """
+    Quick function to generate and encrypt an access token.
+    
+    Args:
+        username: MC5 username
+        password: Account password
+        device_id: Device ID (generated if not provided)
+        scope: Permission scopes
+        nonce: Nonce value for encryption
+        
+    Returns:
+        Dictionary containing encrypted token information
+    """
+    token_gen = TokenGenerator()
+    try:
+        result = token_gen.generate_encrypted_token(username, password, device_id, scope, nonce)
+        return result
+    finally:
+        token_gen.close()
+
+def quick_encrypt_token(
+    access_token: str,
+    nonce: str = "*"
+) -> str:
+    """
+    Quick function to encrypt an existing access token.
+    
+    Args:
+        access_token: Raw access token string
+        nonce: Nonce value for encryption
+        
+    Returns:
+        Encrypted token string
+    """
+    token_gen = TokenGenerator()
+    try:
+        result = token_gen.encrypt_token(access_token, nonce)
+        return result
+    finally:
+        token_gen.close()
+
 __all__ = [
     "MC5Client",
     "SimpleMC5Client",
@@ -57,5 +110,7 @@ __all__ = [
     "RateLimitError",
     "help",
     "examples",
-    "quick_reference"
+    "quick_reference",
+    "quick_generate_encrypted_token",
+    "quick_encrypt_token"
 ]

mc5_api_client/auth.py

@@ -38,6 +38,7 @@ class TokenGenerator:
         self,
         client_id: str = "1875:55979:6.0.0a:windows:windows",
         auth_url: str = "https://eur-janus.gameloft.com:443/authorize",
+        encrypt_url: str = "https://eur-janus.gameloft.com/encrypt_token",
         timeout: int = 30,
         max_retries: int = 3
     ):
@@ -47,11 +48,13 @@ class TokenGenerator:
         Args:
             client_id: Game client identifier
             auth_url: Authentication endpoint URL
+            encrypt_url: Token encryption endpoint URL
             timeout: Request timeout in seconds
             max_retries: Maximum number of retry attempts
         """
         self.client_id = client_id
         self.auth_url = auth_url
+        self.encrypt_url = encrypt_url
         self.timeout = timeout
         self.max_retries = max_retries
         
@@ -275,6 +278,95 @@ class TokenGenerator:
             "signature": parts[6] if len(parts) > 6 else None
         }
     
+    def encrypt_token(
+        self,
+        access_token: str,
+        nonce: str = "*"
+    ) -> str:
+        """
+        Encrypt an access token for additional security.
+        
+        Args:
+            access_token: Raw access token string
+            nonce: Nonce value for encryption (default: "*")
+            
+        Returns:
+            Encrypted token string
+            
+        Raises:
+            AuthenticationError: If encryption fails
+            NetworkError: If network issues occur
+        """
+        payload = {
+            "access_token": access_token,
+            "nonce": nonce
+        }
+        
+        try:
+            print("🔐 Encrypting token...")
+            response = self.session.post(
+                self.encrypt_url,
+                data=payload,
+                timeout=self.timeout
+            )
+            
+            if response.status_code == 200:
+                encrypted_token = response.text.strip()
+                if encrypted_token:
+                    print("✅ Token encrypted successfully")
+                    return encrypted_token
+                else:
+                    raise AuthenticationError("Empty encrypted token response")
+            else:
+                raise AuthenticationError(
+                    f"Token encryption failed with status {response.status_code}: {response.text}"
+                )
+                
+        except requests.exceptions.Timeout:
+            raise NetworkError("Token encryption request timed out")
+        except requests.exceptions.ConnectionError:
+            raise NetworkError("Failed to connect to encryption server")
+        except requests.exceptions.RequestException as e:
+            raise NetworkError(f"Network error during token encryption: {e}")
+    
+    def generate_encrypted_token(
+        self,
+        username: str,
+        password: str,
+        device_id: Optional[str] = None,
+        scope: str = "alert auth chat leaderboard_ro lobby message session social config storage_ro tracking_bi feed storage leaderboard_admin social_eve social soc transaction schedule lottery voice matchmaker",
+        nonce: str = "*"
+    ) -> Dict[str, Any]:
+        """
+        Generate and encrypt an access token in one step.
+        
+        Args:
+            username: MC5 username
+            password: Account password
+            device_id: Device ID (generated if not provided)
+            scope: Space-separated list of permission scopes
+            nonce: Nonce value for encryption (default: "*")
+            
+        Returns:
+            Dictionary containing encrypted token information
+            
+        Raises:
+            InvalidCredentialsError: If credentials are invalid
+            AuthenticationError: If authentication or encryption fails
+            NetworkError: If network issues occur
+        """
+        # First generate regular token
+        token_data = self.generate_token(username, password, device_id, scope)
+        
+        # Then encrypt it
+        encrypted_token = self.encrypt_token(token_data["access_token"], nonce)
+        
+        # Add encrypted token to result
+        token_data["encrypted_token"] = encrypted_token
+        token_data["nonce"] = nonce
+        
+        return token_data
+    
     def close(self):
         """Close the HTTP session."""
         if self.session:

mc5_api_client/cli.py

@@ -438,19 +438,19 @@ class MC5CLI:
     
     def _print_help(self):
         """Print help information."""
-        self._print("🎮 MC5 API Client CLI", "cyan")
+        self._print("MC5 API Client CLI", "cyan")
         self._print("=" * 30, "cyan")
         self._print("\nAvailable commands:", "yellow")
         self._print("  --help, -h    Show this help message")
         self._print("  version       Show version information")
-        self._print("\n📚 For more examples, see the README.md file!", "green")
+        self._print("\nFor more examples, see the README.md file!", "green")
     
     def _print_version(self):
         """Print version information."""
-        self._print("🎮 MC5 API Client v1.0.0", "cyan")
-        self._print("📦 The ultimate Modern Combat 5 API library", "green")
-        self._print("👤 Author: Chizoba", "blue")
-        self._print("📧 Email: chizoba2026@hotmail.com", "blue")
+        self._print("MC5 API Client v1.0.11", "cyan")
+        self._print("The ultimate Modern Combat 5 API library", "green")
+        self._print("Author: Chizoba", "blue")
+        self._print("Email: chizoba2026@hotmail.com", "blue")
 
 
 def main():

{mc5_api_client-1.0.9.dist-info → mc5_api_client-1.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mc5_api_client
-Version: 1.0.9
+Version: 1.0.11
 Summary: A comprehensive Python library for interacting with the Modern Combat 5 API
 Home-page: https://pypi.org/project/mc5-api-client/
 Author: Chizoba
@@ -413,15 +413,16 @@ try: except MC5APIError:
 ### **🚀 Install from PyPI (Recommended)**
 
 ```bash
-pip install mc5_api_client==1.0.8
+pip install mc5_api_client==1.0.10
 ```
 
-✅ **Published and Available!** The MC5 API Client v1.0.8 is now live on PyPI with advanced automation features and admin capabilities!
+✅ **Published and Available!** The MC5 API Client v1.0.10 is now live on PyPI with advanced automation features and admin capabilities!
 
 ### **� Install from Local Package**
 
 ```bash
 # Install the wheel file you just created
+pip install dist/mc5_api_client-1.0.10-py3-none-any.whl
 pip install dist/mc5_api_client-1.0.8-py3-none-any.whl
 
 # Or install from source
@@ -809,112 +810,101 @@ for event in events:
             print(f"      Task {i+1}: {points} points")
 ```
 
-### 🏆 Checking Leaderboards
+### 🔐 **Encrypted Token Support**
 
-See how you stack up:
+For users who prefer additional security, the module now supports token encryption:
 
 ```python
-# Get regular leaderboard
-leaderboard = client.get_leaderboard("ro")
-print(f"Top {len(leaderboard.get('players', []))} players")
+from mc5_api_client import quick_generate_encrypted_token, quick_encrypt_token
 
-# Admin leaderboard (if you have admin access)
-# admin_leaderboard = client.get_leaderboard("admin")
-```
-
-## 🖥️ CLI Commands - Your Command Center
-
-The CLI tool is like having a remote control for MC5! Here are all the commands:
+# Generate and encrypt a token in one step
+encrypted_data = quick_generate_encrypted_token(
+    username="anonymous:d2luOF92M18xNzcwMDUxNjkwXy7H33aeTVB4YZictyDq48c=",
+    password="sSJKzhQ5l4vrFgov",
+    nonce="*"  # Custom nonce value (optional)
+)
 
-### 🔑 Token Management
+print(f"Token ID: {encrypted_data['token_id']}")
+print(f"Encrypted Token: {encrypted_data['encrypted_token']}")
+print(f"Expires: {encrypted_data['expires_at']}")
 
-**Generate a new token:**
-```bash
-mc5 generate-token --username "anonymous:your_credential" --password "your_password" --save
+# Encrypt an existing token
+existing_token = "your_raw_access_token_here"
+encrypted_token = quick_encrypt_token(existing_token, "*")
+print(f"Encrypted: {encrypted_token}")
 ```
 
-**Generate admin token:**
-```bash
-mc5 generate-admin-token --save
-```
+**Advanced TokenGenerator Usage:**
 
-**Check if your token is still good:**
-```bash
-mc5 validate-token
-```
-
-### 🏰 Clan Management
-
-**Search for clans:**
-```bash
-mc5 clan search "Elite" --limit 10
-```
+```python
+from mc5_api_client import TokenGenerator
 
-**Create a new clan:**
-```bash
-mc5 clan create --name "Python Warriors" --tag "PYW" --description "A clan for Python developers!"
-```
+# Create token generator with custom settings
+token_gen = TokenGenerator(
+    encrypt_url="https://eur-janus.gameloft.com/encrypt_token"
+)
 
-**Get clan information:**
-```bash
-mc5 clan info your-clan-id
+try:
+    # Generate encrypted token
+    result = token_gen.generate_encrypted_token(
+        username="anonymous:credential",
+        password="password",
+        nonce="custom_nonce"
+    )
+    
+    # Or encrypt existing token
+    encrypted = token_gen.encrypt_token(
+        access_token="raw_token",
+        nonce="custom_nonce"
+    )
+    
+finally:
+    token_gen.close()  # Always close the session
 ```
 
-**Get clan members:**
-```bash
-mc5 clan members your-clan-id
-```
+**Security Benefits:**
+- ✅ **Additional Layer**: Tokens are encrypted before transmission
+- ✅ **Custom Nonce**: Support for custom nonce values
+- ✅ **Backward Compatible**: Works with existing authentication flow
+- ✅ **Error Handling**: Proper validation and error recovery
 
-**Invite a player:**
-```bash
-mc5 clan invite your-clan-id "anonymous:player_credential" --role officer
-```
+### 🏆 **Checking Leaderboards**
 
-**Handle applications:**
-```bash
-mc5 clan applications your-clan-id
-mc5 clan accept your-clan-id "anonymous:applicant" --role member
-mc5 clan reject your-clan-id "anonymous:applicant"
-```
+See how you stack up:
 
-**Apply to join a clan:**
-```bash
-mc5 clan apply target-clan-id --message "Let me join your squad!"
-```
+```python
+from mc5_api_client import MC5Client
 
-**Get clan statistics:**
-```bash
-mc5 clan stats your-clan-id
+# Test that the method exists
+client = MC5Client()
+if hasattr(client, 'get_leaderboard'):
+    print("✅ get_leaderboard method available")
+    
+    # You would need to authenticate first:
+    # client.authenticate('username', 'password')
+    # leaderboard = client.get_leaderboard("ro")
+    # print(f"Top {len(leaderboard.get('players', []))} players")
+else:
+    print("❌ get_leaderboard method not found")
 ```
 
-**Get clan leaderboard:**
-```bash
-mc5 clan leaderboard your-clan-id
-```
+### 🖥️ CLI Commands - Currently Available
 
-### ⚙️ Configuration
+The CLI tool provides basic functionality with these commands:
 
-**See your saved info:**
 ```bash
-mc5 show-config
-```
+# Show help information
+python -m mc5_api_client.cli --help
 
-**Clear everything (start fresh):**
-```bash
-mc5 clear-config
+# Show version information
+python -m mc5_api_client.cli version
 ```
 
-### 🎨 Cool Options
-
-**Enable debug mode (see what's happening behind the scenes):**
-```bash
-mc5 --debug generate-token --username "..." --password "..."
-```
+**Current Available Commands:**
+- `--help, -h` - Show help message
+- `version` - Show version information
 
-**Skip the fancy banner:**
-```bash
-mc5 --no-banner validate-token
-```
+**Note**: Advanced CLI commands (token management, clan operations) are planned features for future versions. The current CLI provides basic help and version functionality.
 
 ## 🔧 Where Does Everything Get Saved?
 

mc5_api_client-1.0.11.dist-info/RECORD

@@ -0,0 +1,15 @@
+mc5_api_client/__init__.py,sha256=vJQmJ58TMBZ6Qeko7J9mQJht_71bwc7obVQtNrvkFQY,3296
+mc5_api_client/admin_client.py,sha256=527aavolxVhY2M5ceFxVbbE5YTczU9Z86Fdt1UzdRZM,15220
+mc5_api_client/auth.py,sha256=z8vmyQIHUdAzk0pUyKCesT8gTv4jboLIFGBxAu1v_-8,13396
+mc5_api_client/cli.py,sha256=D5RTwRQJz86xf8Ocqj0Zr4O3BjPIj6_kbChEeF-ha5g,17255
+mc5_api_client/client.py,sha256=q5PkdpTXjWCXdLFiK1-zqa7fThJGE4Z99A3ccMfwJIY,79239
+mc5_api_client/exceptions.py,sha256=o7od4GrEIlgq6xSNUjZdh74xoDTytF3PLcMq5ewRiJw,2683
+mc5_api_client/help.py,sha256=sqf3R6VHQuSYLvAMzh8nXAgCX5URsvXydvw8P0ATabg,7246
+mc5_api_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mc5_api_client/simple_client.py,sha256=31JI2rURHIXKcnDXQYJNpr-gypweO56ANFdhD-Z4Ft0,20241
+mc5_api_client-1.0.11.dist-info/licenses/LICENSE,sha256=M0UBQ4B3pB9XcV54_jhVP681xyauF8GB6YK_rKmuXzk,1064
+mc5_api_client-1.0.11.dist-info/METADATA,sha256=q6squlB7kiIgfioZBPKfPWniTFXoV8I-2rTKgZQyX6k,54718
+mc5_api_client-1.0.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mc5_api_client-1.0.11.dist-info/entry_points.txt,sha256=2kruOpleFYK3Jl1MoQwGyqCd-Pj4kQWngXmIjnXx_gE,48
+mc5_api_client-1.0.11.dist-info/top_level.txt,sha256=eYJe4ue9j1ig_jFY5Z05mDqpizUEV7TYpk5lBXVd4kA,15
+mc5_api_client-1.0.11.dist-info/RECORD,,

mc5_api_client-1.0.9.dist-info/RECORD

@@ -1,15 +0,0 @@
-mc5_api_client/__init__.py,sha256=nEPnDWX7LtB9vDyBfNqBFDNP9Wskusav6Z0IM1SvI8Y,1711
-mc5_api_client/admin_client.py,sha256=527aavolxVhY2M5ceFxVbbE5YTczU9Z86Fdt1UzdRZM,15220
-mc5_api_client/auth.py,sha256=Yj_6s8KmtbswWbR6q816d8soIirUF2aD_KWxg-jNqR0,9978
-mc5_api_client/cli.py,sha256=KegNTxwq28gu_vrffc_cXcALrHzUBDHd-5DqKyYp4p0,17284
-mc5_api_client/client.py,sha256=q5PkdpTXjWCXdLFiK1-zqa7fThJGE4Z99A3ccMfwJIY,79239
-mc5_api_client/exceptions.py,sha256=o7od4GrEIlgq6xSNUjZdh74xoDTytF3PLcMq5ewRiJw,2683
-mc5_api_client/help.py,sha256=sqf3R6VHQuSYLvAMzh8nXAgCX5URsvXydvw8P0ATabg,7246
-mc5_api_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mc5_api_client/simple_client.py,sha256=31JI2rURHIXKcnDXQYJNpr-gypweO56ANFdhD-Z4Ft0,20241
-mc5_api_client-1.0.9.dist-info/licenses/LICENSE,sha256=M0UBQ4B3pB9XcV54_jhVP681xyauF8GB6YK_rKmuXzk,1064
-mc5_api_client-1.0.9.dist-info/METADATA,sha256=BvCujXZkPKOGRs-_BMiQRyjtmZlJH4yHg0r76XMXGs4,53906
-mc5_api_client-1.0.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-mc5_api_client-1.0.9.dist-info/entry_points.txt,sha256=2kruOpleFYK3Jl1MoQwGyqCd-Pj4kQWngXmIjnXx_gE,48
-mc5_api_client-1.0.9.dist-info/top_level.txt,sha256=eYJe4ue9j1ig_jFY5Z05mDqpizUEV7TYpk5lBXVd4kA,15
-mc5_api_client-1.0.9.dist-info/RECORD,,