Repository: yt-dlp/yt-dlp
File: yt_dlp/extractor/sonyliv.py (Python)

Code before:

    def _login(self, username, password):
        if len(username) == 10 and username.isdigit() and self._AUTH_TOKEN is None:
            self.report_login()
            data = '''{"mobileNumber":"%s","channelPartnerID":"MSMIND","country":"IN","timestamp":"%s",
            "otpSize":6,"loginType":"REGISTERORSIGNIN","isMobileMandatory":true}
             ''' % (username, datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%MZ"))
            otp_request_json = self._download_json(
                'https://apiv2.sonyliv.com/AGL/1.6/A/ENG/WEB/IN/HR/CREATEOTP-V2',
                None, note='Sending OTP', data=data.encode(), headers=self._HEADERS)
            if otp_request_json['resultCode'] == 'KO':
                raise ExtractorError(otp_request_json['message'], expected=True)
            otp_code = self._get_tfa_info('OTP')
            data = '''{"channelPartnerID":"MSMIND","mobileNumber":"%s","country":"IN","otp":"%s",
            "dmaId":"IN","ageConfirmation":true,"timestamp":"%s","isMobileMandatory":true}
             ''' % (username, otp_code, datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%MZ"))
            otp_verify_json = self._download_json(
                'https://apiv2.sonyliv.com/AGL/2.0/A/ENG/WEB/IN/HR/CONFIRMOTP-V2',
                None, note='Verifying OTP', data=data.encode(), headers=self._HEADERS)
            if otp_verify_json['resultCode'] == 'KO':
                raise ExtractorError(otp_request_json['message'], expected=True)
            self._AUTH_TOKEN = otp_verify_json['resultObj']['accessToken']
            if not self._AUTH_TOKEN:
                raise ExtractorError(otp_verify_json['message'], expected=True)
        elif username.lower() == 'token' and len(password) > 1198:
            self._AUTH_TOKEN = password

    def _call_api(self, version, path, video_id):
        try:
            return self._download_json(
                'https://apiv2.sonyliv.com/AGL/%s/A/ENG/WEB/%s' % (version, path),
                video_id, headers=self._HEADERS)['resultObj']
        except ExtractorError as e:
            if isinstance(e.cause, compat_HTTPError) and e.cause.code == 406 and self._parse_json(
                    e.cause.read().decode(), video_id)['message'] == 'Please subscribe to watch this content':
                self.raise_login_required(self._LOGIN_HINT, method=None)
            if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
                message = self._parse_json(
                    e.cause.read().decode(), video_id)['message']
                if message == 'Geoblocked Country':
                    self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
                raise ExtractorError(message)
            raise

    def _real_initialize(self):
        self._HEADERS['security_token'] = self._call_api('1.4', 'ALL/GETTOKEN', None)
        username, password = self._get_login_info()
        if username:
            self._HEADERS['device_id'] = self._get_device_id()
            self._HEADERS['content-type'] = 'application/json'
            self._login(username, password)

Review comment (refactor):
```py
    def _login(self, username, password):
        if username == 'token' and len(password) > 1198:
            return password
        elif len(username) != 10 or not username.isdigit():
            raise ExtractorError(f'Invalid username/password; {self._LOGIN_HINT}')
        ...
        return otp_verify_json['resultObj']['accessToken']
```

Code after:
    def _login(self, username, password):
        if username.lower() == 'token' and len(password) > 1198:
            return password
        elif len(username) != 10 or not username.isdigit():
            raise ExtractorError(f'Invalid username/password; {self._LOGIN_HINT}')

        self.report_login()
        data = '''{"mobileNumber":"%s","channelPartnerID":"MSMIND","country":"IN","timestamp":"%s",
        "otpSize":6,"loginType":"REGISTERORSIGNIN","isMobileMandatory":true}
         ''' % (username, datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%MZ"))
        otp_request_json = self._download_json(
            'https://apiv2.sonyliv.com/AGL/1.6/A/ENG/WEB/IN/HR/CREATEOTP-V2',
            None, note='Sending OTP', data=data.encode(), headers=self._HEADERS)
        if otp_request_json['resultCode'] == 'KO':
            raise ExtractorError(otp_request_json['message'], expected=True)
        otp_code = self._get_tfa_info('OTP')
        data = '''{"channelPartnerID":"MSMIND","mobileNumber":"%s","country":"IN","otp":"%s",
        "dmaId":"IN","ageConfirmation":true,"timestamp":"%s","isMobileMandatory":true}
         ''' % (username, otp_code, datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%MZ"))
        otp_verify_json = self._download_json(
            'https://apiv2.sonyliv.com/AGL/2.0/A/ENG/WEB/IN/HR/CONFIRMOTP-V2',
            None, note='Verifying OTP', data=data.encode(), headers=self._HEADERS)
        if otp_verify_json['resultCode'] == 'KO':
            raise ExtractorError(otp_request_json['message'], expected=True)
        return otp_verify_json['resultObj']['accessToken']

    def _call_api(self, version, path, video_id):
        try:
            return self._download_json(
                'https://apiv2.sonyliv.com/AGL/%s/A/ENG/WEB/%s' % (version, path),
                video_id, headers=self._HEADERS)['resultObj']
        except ExtractorError as e:
            if isinstance(e.cause, compat_HTTPError) and e.cause.code == 406 and self._parse_json(
                    e.cause.read().decode(), video_id)['message'] == 'Please subscribe to watch this content':
                self.raise_login_required(self._LOGIN_HINT, method=None)
            if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
                message = self._parse_json(
                    e.cause.read().decode(), video_id)['message']
                if message == 'Geoblocked Country':
                    self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
                raise ExtractorError(message)
            raise

    def _real_initialize(self):
        self._HEADERS['security_token'] = self._call_api('1.4', 'ALL/GETTOKEN', None)
        username, password = self._get_login_info()
        if username:
            self._HEADERS['device_id'] = self._get_device_id()
            self._HEADERS['content-type'] = 'application/json'
            self._HEADERS['authorization'] = self._login(username, password)