Version 0.6.199, bug fixes X.Node.Anime & X.Util.Window & X.Net.OAuth2 & X.UI.*.

[pettanr/clientJs.git] / 0.6.x / js / 06_net / 10_XOAuth2.js

diff --git a/0.6.x/js/06_net/10_XOAuth2.js b/0.6.x/js/06_net/10_XOAuth2.js
index 063cb4a..b6632be 100644 (file)
--- a/0.6.x/js/06_net/10_XOAuth2.js
+++ b/0.6.x/js/06_net/10_XOAuth2.js
@@ -1,7 +1,7 @@
 
-//{+oauth2"OAuth2 サービスの定義"(OAuth2外部サービスを定義し、認可プロセス・xhrの署名を自動化します)[+xhr]
-var X_NET_OAUTH2_authorizationWindow,
-       X_NET_OAUTH2_authorizationTimerID;
+//{+oauth2"OAuth2 サービスの定義"(OAuth2外部サービスを定義し、認可プロセス・xhrの署名を自動化します)[+xhr,+window]
+var X_OAUTH2_authWindow,
+       X_OAUTH2_authTimerID;
 
 /**
  * イベント
@@ -73,7 +73,7 @@ X[ 'OAuth2' ] = X_EventDispatcher[ 'inherits' ](
                                };
                                
                                // TODO canUse gadgetProxy
-                               this[ 'listen' ]( [ X_EVENT_KILL_INSTANCE, X_EVENT_SUCCESS, X_EVENT_ERROR, X_EVENT_NEED_AUTH ], X_NET_OAUTH2_handleEvent );
+                               this[ 'listen' ]( [ X_EVENT_KILL_INSTANCE, X_EVENT_SUCCESS, X_EVENT_ERROR, X_EVENT_NEED_AUTH ], X_OAUTH2_handleEvent );
                        },
 
                        /**
@@ -113,7 +113,7 @@ X[ 'OAuth2' ] = X_EventDispatcher[ 'inherits' ](
                                };
                                
                                // 二つ以上の popup を作らない
-                               if( X_NET_OAUTH2_authorizationWindow ) return;
+                               if( X_OAUTH2_authWindow ) return;
                                
                                pair = X_Pair_get( this );
                                
@@ -121,25 +121,25 @@ X[ 'OAuth2' ] = X_EventDispatcher[ 'inherits' ](
 
                                w   = pair[ 'authorizeWindowWidth' ]  || 500;
                                h   = pair[ 'authorizeWindowHeight' ] || 500;
+
+                               X_OAUTH2_authWindow = X_Window( {
+                                       'url' : X_URL_create( pair[ 'authorizeEndpoint' ],
+                                                       {
+                                                               'response_type' : 'code',
+                                                               'client_id'     : pair[ 'clientID' ],
+                                                               'redirect_uri'  : pair[ 'redirectURI' ],
+                                                               'scope'         : ( pair[ 'scopes' ] || [] ).join( ' ' )
+                                                       }
+                                               ),
+                                       'name'   : 'oauthauthorize',
+                                       'params' : 'width=' + w
+                                               + ',height=' + h
+                                               + ',left=' + ( screen.width  - w ) / 2
+                                               + ',top='  + ( screen.height - h ) / 2
+                                               + ',menubar=no,toolbar=no'
+                               } )[ 'listen' ]( X_EVENT_UNLOAD, this, X_OAuth2_detectAuthPopup );
                                
-                               // TODO X.Util.Window
-                               X_NET_OAUTH2_authorizationWindow = window.open(
-                                       X_URL_create( pair[ 'authorizeEndpoint' ],
-                                               {
-                                                       'response_type' : 'code',
-                                                       'client_id'     : pair[ 'clientID' ],
-                                                       'redirect_uri'  : pair[ 'redirectURI' ],
-                                                       'scope'         : ( pair[ 'scopes' ] || [] ).join( ' ' )
-                                               }
-                                       ),
-                                       'oauthauthorize',
-                                       'width=' + w
-                                       + ',height=' + h
-                                       + ',left=' + ( screen.width  - w ) / 2
-                                       + ',top='  + ( screen.height - h ) / 2
-                                       + ',menubar=no,toolbar=no');
-                               
-                               X_NET_OAUTH2_authorizationTimerID = X_Timer_add( 333, 0, this, X_Net_OAuth2_detectAuthPopup );
+                               X_OAUTH2_authTimerID = X_Timer_add( 333, 0, this, X_OAuth2_detectAuthPopup );
                                
                                pair.oauth2State = 1;
                                
@@ -162,17 +162,13 @@ X[ 'OAuth2' ] = X_EventDispatcher[ 'inherits' ](
                                };
                                
                                // http://kojikoji75.hatenablog.com/entry/2013/12/15/223839
-                               if( X_NET_OAUTH2_authorizationWindow ){
-                                       if( 9 < X_UA[ 'IEHost' ] ){
-                                               X_NET_OAUTH2_authorizationWindow.close();
-                                       } else {
-                                               X_NET_OAUTH2_authorizationWindow.open( 'about:blank', '_self' ).close();
-                                       };
-                                       X_NET_OAUTH2_authorizationWindow  = null;                                       
+                               if( X_OAUTH2_authWindow ){
+                                       X_OAUTH2_authWindow[ 'kill' ]();
+                                       X_OAUTH2_authWindow = null;                                     
                                };
                                
-                               X_NET_OAUTH2_authorizationTimerID && X_Timer_remove( X_NET_OAUTH2_authorizationTimerID );
-                               X_NET_OAUTH2_authorizationTimerID = 0;
+                               X_OAUTH2_authTimerID && X_Timer_remove( X_OAUTH2_authTimerID );
+                               X_OAUTH2_authTimerID = 0;
                                
                                this[ 'asyncDispatch' ]( X_EVENT_CANCELED );
                        },
@@ -213,14 +209,14 @@ X[ 'OAuth2' ] = X_EventDispatcher[ 'inherits' ](
                                                                        'Content-Type' : 'application/x-www-form-urlencoded'
                                                                },
                                        'test'     : 'gadget' // canuse
-                               } ).listenOnce( [ X_EVENT_SUCCESS, X_EVENT_ERROR ], this, X_Net_OAuth2_responceHandler );
+                               } ).listenOnce( [ X_EVENT_SUCCESS, X_EVENT_ERROR ], this, X_OAuth2_responceHandler );
                                
                                this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, message : 'Start to refresh token.' } );
                        }
                }
        );
 
-function X_NET_OAUTH2_handleEvent( e ){
+function X_OAUTH2_handleEvent( e ){
        var pair = X_Pair_get( this );
        
        switch( e.type ){
@@ -241,41 +237,35 @@ function X_NET_OAUTH2_handleEvent( e ){
        };
 };
 
-function X_Net_OAuth2_detectAuthPopup(){
-       var closed, search, pair = X_Pair_get( this );
-       
-       if( X_NET_OAUTH2_authorizationWindow.closed ){
-               pair.oauth2State = 0;
-               closed = true;
+function X_OAuth2_detectAuthPopup( e ){
+       var pair = X_Pair_get( this ),
+               status, search;
 
+       if( X_OAUTH2_authWindow[ 'closed' ]() ){
+               status = 0;
                this[ 'asyncDispatch' ]( X_EVENT_CANCELED );
        } else
-       if( search = X_Script_try( X_Object_find, [ X_NET_OAUTH2_authorizationWindow, 'location>search' ] ) ){
-               pair      = X_Pair_get( this );
+       if( search = X_OAUTH2_authWindow[ 'find' ]( 'location>search' ) ){
+               pair = X_Pair_get( this );
                pair.code = X_URL_paramToObj( search.slice( 1 ) )[ 'code' ];
-
-               if( 9 < X_UA[ 'IEHost' ] ){
-                       X_NET_OAUTH2_authorizationWindow.close();
-               } else {
-                       X_NET_OAUTH2_authorizationWindow.open( 'about:blank', '_self' ).close();
-               };
-               closed = true;
-
-               X_Net_OAuth2_authorizationCode( this, pair );
-               
-               pair.oauth2State = 2;
+               status = 2;
+               X_OAuth2_authorizationCode( this, pair );
                this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, message : 'Get code success, then authorization code.' } );
        };
        
-       if( closed ){
-               X_NET_OAUTH2_authorizationWindow  = null;
-               X_NET_OAUTH2_authorizationTimerID = 0;
+       if( 0 <= status ){
+               pair = pair || X_Pair_get( this );
+               pair.oauth2State = status;
+               
+               X_OAUTH2_authWindow[ 'kill' ]();
+               X_OAUTH2_authWindow  = null;
+               X_OAUTH2_authTimerID = X_Timer_remove( X_OAUTH2_authTimerID );
                
                return X_CALLBACK_UN_LISTEN;
        };
 };
 
-function X_Net_OAuth2_authorizationCode( oauth2, pair ){       
+function X_OAuth2_authorizationCode( oauth2, pair ){   
        pair.net = X.Net( {
                'xhr'      : pair[ 'tokenEndpoint' ],
                'postdata' : X_URL_objToParam({
@@ -291,10 +281,10 @@ function X_Net_OAuth2_authorizationCode( oauth2, pair ){
                        'Content-Type' : 'application/x-www-form-urlencoded'
                },
                'test'     : 'gadget'
-       } ).listenOnce( [ X_EVENT_SUCCESS, X_EVENT_ERROR ], oauth2, X_Net_OAuth2_responceHandler );
+       } ).listenOnce( [ X_EVENT_SUCCESS, X_EVENT_ERROR ], oauth2, X_OAuth2_responceHandler );
 };
 
-function X_Net_OAuth2_responceHandler( e ){
+function X_OAuth2_responceHandler( e ){
        var data = e.response,
                pair = X_Pair_get( this ),
                isRefresh = pair.oauth2State === 3;
@@ -353,7 +343,7 @@ function X_Net_OAuth2_responceHandler( e ){
                                X_OAuth2_setAuthMechanism( this, 'param' );
                                this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, message : 'Refresh access token failed. retry header -> param. ' } );
                                // retry
-                               X_Net_OAuth2_authorizationCode( this, pair );
+                               X_OAuth2_authorizationCode( this, pair );
                        };
                        break;
        };