журнал (shhh) wrote in changelog,
журнал
shhh
changelog

[ljcom] r12021: LJSUP-12366: Skip step 'congratulations'...

Committer: nnikulochkina
LJSUP-12366: Skip step 'congratulations' for identity accounts if account was created for oauth-authorization
U   trunk/htdocs/identity/callback-facebook.bml
U   trunk/htdocs/identity/callback-google.bml
U   trunk/htdocs/identity/callback-mailru.bml
U   trunk/htdocs/identity/callback-twitter.bml
U   trunk/htdocs/identity/callback-vkontakte.bml
Modified: trunk/htdocs/identity/callback-facebook.bml
===================================================================
--- trunk/htdocs/identity/callback-facebook.bml	2012-05-28 13:22:21 UTC (rev 12020)
+++ trunk/htdocs/identity/callback-facebook.bml	2012-05-28 14:40:39 UTC (rev 12021)
@@ -11,9 +11,9 @@
 
     my $forwhat = LJ::Request->get_param('forwhat') || 'login';
 
-    my ($returl, $returl_fail);
+    my ($returl, $returl_fail, $skip_interstitial);
     eval {
-        ($returl, $returl_fail) =
+        ($returl, $returl_fail, $skip_interstitial) =
         LJ::Identity::Facebook->unpack_forwhat($forwhat);
     };
 
@@ -84,6 +84,8 @@
 
     return LJ::Request->redirect($returl) unless $created;
 
+    return LJ::Request->redirect($returl) if $skip_interstitial;
+
     my $redirect_url = "$LJ::SITEROOT/identity/facebook-interstitial.bml?" .
                        'ret=' . LJ::eurl($returl) . '&' .
                        'forwhat=' . LJ::eurl($forwhat);

Modified: trunk/htdocs/identity/callback-google.bml
===================================================================
--- trunk/htdocs/identity/callback-google.bml	2012-05-28 13:22:21 UTC (rev 12020)
+++ trunk/htdocs/identity/callback-google.bml	2012-05-28 14:40:39 UTC (rev 12021)
@@ -12,9 +12,9 @@
 
     my $forwhat = LJ::Request->cookie('identity_login_forwhat');
 
-    my ($returl, $returl_fail);
+    my ($returl, $returl_fail, $skip_interstitial);
     eval {
-        ($returl, $returl_fail) =
+        ($returl, $returl_fail, $skip_interstitial) =
         LJ::Identity::Google->unpack_forwhat($forwhat);
     };
 
@@ -75,6 +75,8 @@
 
     return LJ::Request->redirect($returl) unless $created;
 
+    return LJ::Request->redirect($returl) if $skip_interstitial;
+
     my $redirect_url = "$LJ::SITEROOT/identity/google-interstitial.bml?" .
                        'ret=' . LJ::eurl($returl) . '&' .
                        'forwhat=' . LJ::eurl($forwhat);
@@ -87,4 +89,4 @@
 head<=
 <?_code return $headextra; _code?>
 <=head
-page?>
\ No newline at end of file
+page?>

Modified: trunk/htdocs/identity/callback-mailru.bml
===================================================================
--- trunk/htdocs/identity/callback-mailru.bml	2012-05-28 13:22:21 UTC (rev 12020)
+++ trunk/htdocs/identity/callback-mailru.bml	2012-05-28 14:40:39 UTC (rev 12021)
@@ -11,9 +11,9 @@
 
     my $forwhat = LJ::Request->get_param('forwhat') || 'login';
 
-    my ($returl, $returl_fail);
+    my ($returl, $returl_fail, $skip_interstitial);
     eval {
-        ($returl, $returl_fail) =
+        ($returl, $returl_fail, $skip_interstitial) =
         LJ::Identity::MailRU->unpack_forwhat($forwhat);
     };
 
@@ -91,6 +91,8 @@
 
     return LJ::Request->redirect($returl) unless $created;
 
+    return LJ::Request->redirect($returl) if $skip_interstitial;
+
     my $redirect_url = "$LJ::SITEROOT/identity/mailru-interstitial.bml?" .
                        'ret=' . LJ::eurl($returl) . '&' .
                        'forwhat=' . LJ::eurl($forwhat);

Modified: trunk/htdocs/identity/callback-twitter.bml
===================================================================
--- trunk/htdocs/identity/callback-twitter.bml	2012-05-28 13:22:21 UTC (rev 12020)
+++ trunk/htdocs/identity/callback-twitter.bml	2012-05-28 14:40:39 UTC (rev 12021)
@@ -11,9 +11,9 @@
 
     my $forwhat = LJ::Request->get_param('forwhat') || 'login';
 
-    my ($returl, $returl_fail);
+    my ($returl, $returl_fail, $skip_interstitial);
     eval {
-        ($returl, $returl_fail) =
+        ($returl, $returl_fail, $skip_interstitial) =
         LJ::Identity::Twitter->unpack_forwhat($forwhat);
     };
 
@@ -62,10 +62,12 @@
 
     return LJ::Request->redirect($returl) unless $created;
 
+    return LJ::Request->redirect($returl) if $skip_interstitial;
+
     my $redirect_url = "$LJ::SITEROOT/identity/twitter-interstitial.bml?" .
                        'ret=' . LJ::eurl($returl) . '&' .
                        'forwhat=' . LJ::eurl($forwhat);
-
+    
     return LJ::Request->redirect($redirect_url);
 }
 _code?>

Modified: trunk/htdocs/identity/callback-vkontakte.bml
===================================================================
--- trunk/htdocs/identity/callback-vkontakte.bml	2012-05-28 13:22:21 UTC (rev 12020)
+++ trunk/htdocs/identity/callback-vkontakte.bml	2012-05-28 14:40:39 UTC (rev 12021)
@@ -12,9 +12,9 @@
 
     my $forwhat = LJ::Request->get_param('forwhat') || 'login';
 
-    my ($returl, $returl_fail);
+    my ($returl, $returl_fail, $skip_interstitial);
     eval {
-        ($returl, $returl_fail) =
+        ($returl, $returl_fail, $skip_interstitial) =
         LJ::Identity::Vkontakte->unpack_forwhat($forwhat);
     };
 
@@ -55,6 +55,8 @@
 
     return LJ::Request->redirect($returl) unless $created;
 
+    return LJ::Request->redirect($returl) if $skip_interstitial;
+
     my $redirect_url = "$LJ::SITEROOT/identity/vkontakte-interstitial.bml?" .
                        'ret=' . LJ::eurl($returl) . '&' .
                        'forwhat=' . LJ::eurl($forwhat);

Tags: bml, ljcom, nikulochkina, nnikulochkina
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments