[Lada-commits] [PATCH 1 of 5] Removed OpenId stuff

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1439459306 -7200
# Node ID 44d7822d0d551b6298ca05510eb9101b0574515d
# Parent  9fc4afd21f7fb65496d483ae4894c4fb174f12fa
Removed OpenId stuff.

diff -r 9fc4afd21f7f -r 44d7822d0d55 app.js
--- a/app.js	Tue Aug 11 13:34:44 2015 +0200
+++ b/app.js	Thu Aug 13 11:48:26 2015 +0200
@@ -69,11 +69,8 @@
             Lada.openIDParams = queryString;
         }
         Ext.Ajax.request({
-            url: 'lada-server/login?return_to=' + window.location.href,
+            url: 'lada-server/user',
             method: 'GET',
-            headers: {
-                'X-OPENID-PARAMS': Lada.openIDParams
-            },
             scope: this,
             success: this.onLoginSuccess,
             failure: this.onLoginFailure
@@ -87,8 +84,8 @@
                 if (json.message === '699') {
                     /* This is the unauthorized message with the authentication
                      * redirect in the data */
-                    var authUrl = json.data;
-                    location.href = authUrl;
+                    Ext.MessageBox.alert('Es konnte kein Benutzername gefunden werden!',
+                            json.data);
                     return;
                 }
                 if (json.message === '698') {
@@ -107,13 +104,6 @@
     },
 
     onLoginSuccess: function(response) {
-
-        if (!Ext.isIE9m) {
-          /* Strip out the openid query params to look nicers. */
-          // Not supported in old IE's
-          window.history.pushState(this.name, this.name, window.location.pathname);
-        }
-
         Ext.create('Lada.view.Viewport');
 
         /* Parse Username and Timestamp */
diff -r 9fc4afd21f7f -r 44d7822d0d55 app/override/RestProxy.js
--- a/app/override/RestProxy.js	Tue Aug 11 13:34:44 2015 +0200
+++ b/app/override/RestProxy.js	Thu Aug 13 11:48:26 2015 +0200
@@ -8,7 +8,7 @@
 
 Ext.define('Lada.override.RestProxy', {
     override: 'Ext.data.proxy.Rest',
-
+/*
     buildRequest: function (operation) {
         this.headers = { 'X-OPENID-PARAMS': Lada.openIDParams };
         return this.callParent(arguments);
@@ -16,17 +16,17 @@
 
     processResponse: function (success, operation, request, response, callback, scope) {
         /* Check if we were authenticated at one point (Lada.openIDParams) and
-         * if the response means that we lost that authentcation */
+         * if the response means that we lost that authentcation
         if (Lada.openIDParams && !success && response.status == 401) {
             var json = Ext.decode(response.responseText);
             if (json) {
                 if (json.message === "699" || json.message === "698") {
                     /* This is the unauthorized message with the authentication
-                     * redirect in the data */
+                     * redirect in the data 
 
                     /* We decided to handle this with a redirect to the identity
                      * provider. In which case we have no other option then to
-                     * handle it here with relaunch. */
+                     * handle it here with relaunch. 
                     Ext.MessageBox.confirm('Erneutes Login erforderlich',
                         'Der Server konnte die Anfrage nicht authentifizieren.<br/>'+
                         'Für ein erneutes Login muss die Anwendung neu geladen werden.<br/>' +
@@ -37,6 +37,7 @@
         }
         this.callParent(arguments);
     },
+*/
     reload: function(btn) {
         if (btn === 'yes') {
             location.reload();