-
+
+
diff --git a/app/assets/javascripts/components/export_case/export_case_controller.js b/app/assets/javascripts/components/export_case/export_case_controller.js
index f96ffb55e..3f43b324a 100644
--- a/app/assets/javascripts/components/export_case/export_case_controller.js
+++ b/app/assets/javascripts/components/export_case/export_case_controller.js
@@ -13,7 +13,7 @@ angular.module('QuepidApp')
'querySnapshotSvc',
function (
$uibModal,
- $rootScope,
+ $scope,
$log,
caseSvc,
caseCSVSvc,
@@ -22,18 +22,19 @@ angular.module('QuepidApp')
) {
var ctrl = this;
- this.iconOnly = $rootScope.iconOnly;
+ this.iconOnly = $scope.iconOnly;
+ this.supportsDetailedExport = $scope.supportsDetailedExport;
- // If called from the cases listing page, $rootScope.theCase is populated,
+ // If called from the cases listing page, $scope.theCase is populated,
// otherwise on the main page get it from the caseSvc.
- if ($rootScope.theCase) {
- ctrl.theCase = $rootScope.theCase;
+ if ($scope.theCase) {
+ ctrl.theCase = $scope.theCase;
}
else {
ctrl.theCase = caseSvc.getSelectedCase();
}
- $rootScope.$on('caseSelected', function() {
+ $scope.$on('caseSelected', function() {
ctrl.theCase = caseSvc.getSelectedCase();
});
@@ -46,14 +47,17 @@ angular.module('QuepidApp')
if ( options.which === 'general' ) {
$log.info('Selected "general" as export option.');
- $log.info(ctrl.theCase);
- csv = caseCSVSvc.stringify(ctrl.theCase, true);
- blob = new Blob([csv], {
- type: 'text/csv'
- });
- /*global saveAs */
- saveAs(blob, caseCSVSvc.formatDownloadFileName(ctrl.theCase.caseName + '_general.csv'));
+ // Go back to the API in case other users have updates that we should include.
+ caseSvc.get(ctrl.theCase.caseNo, false).then(function(acase) {
+ csv = caseCSVSvc.stringify(acase, true);
+ blob = new Blob([csv], {
+ type: 'text/csv'
+ });
+
+ /*global saveAs */
+ saveAs(blob, caseCSVSvc.formatDownloadFileName(acase.caseName + '_general.csv'));
+ });
} else if ( options.which === 'detailed' ) {
$log.info('Selected "detailed" as export option.');
@@ -129,6 +133,9 @@ angular.module('QuepidApp')
resolve: {
theCase: function() {
return ctrl.theCase;
+ },
+ supportsDetailedExport: function() {
+ return ctrl.supportsDetailedExport;
}
}
});
diff --git a/app/assets/javascripts/components/export_case/export_case_directive.js b/app/assets/javascripts/components/export_case/export_case_directive.js
index 55439f178..470c9ed1d 100644
--- a/app/assets/javascripts/components/export_case/export_case_directive.js
+++ b/app/assets/javascripts/components/export_case/export_case_directive.js
@@ -10,7 +10,8 @@ angular.module('QuepidApp')
templateUrl: 'export_case/export_case.html',
scope: {
theCase: '=',
- iconOnly: '='
+ iconOnly: '=',
+ supportsDetailedExport: '='
}
};
}
diff --git a/app/assets/javascripts/components/export_case/export_case_modal_instance_controller.js b/app/assets/javascripts/components/export_case/export_case_modal_instance_controller.js
index ea51feeee..90339fb2c 100644
--- a/app/assets/javascripts/components/export_case/export_case_modal_instance_controller.js
+++ b/app/assets/javascripts/components/export_case/export_case_modal_instance_controller.js
@@ -6,10 +6,12 @@ angular.module('QuepidApp')
'$uibModalInstance',
'querySnapshotSvc',
'theCase',
- function ($scope, $uibModalInstance, querySnapshotSvc, theCase) {
+ 'supportsDetailedExport',
+ function ($scope, $uibModalInstance, querySnapshotSvc, theCase, supportsDetailedExport) {
var ctrl = this;
ctrl.theCase = theCase;
+ ctrl.supportsDetailedExport = supportsDetailedExport;
// If called from the cases listing page, then we need the call back with the bootstrap,
// otherwise on the main page the querySnapshotSvc.snapshots was bootstrapped.
diff --git a/app/assets/javascripts/components/user_listing/user_listing.html b/app/assets/javascripts/components/user_listing/user_listing.html
index 2e9c67a02..f77838143 100644
--- a/app/assets/javascripts/components/user_listing/user_listing.html
+++ b/app/assets/javascripts/components/user_listing/user_listing.html
@@ -4,6 +4,7 @@
ng-src="{{ ctrl.user.avatar_url }}"
class="img-responsive img-rounded"
alt="{{ ctrl.user.display_name }}"
+ width="48" height="48"
/>
diff --git a/app/assets/javascripts/controllers/login.js b/app/assets/javascripts/controllers/login.js
deleted file mode 100644
index 161e4a6d5..000000000
--- a/app/assets/javascripts/controllers/login.js
+++ /dev/null
@@ -1,34 +0,0 @@
-'use strict';
-
-angular.module('QuepidSecureApp')
- .controller('LoginCtrl', [
- '$scope', '$location',
- 'loginSvc',
- function ($scope, $location, loginSvc) {
- $scope.submit = function (user, pass) {
- $scope.warnDefined = false;
- $scope.warnErr = false;
- $scope.warnInvalid = false;
- $scope.warnLocked = false;
-
- loginSvc.login(user, pass, function(response) { // need to define an error handler
- if( response.status/1 === 404 ) {
- $scope.warnUndefined = true;
- return;
- }
-
- if ( response.status/1 === 400 ) {
- $scope.warnInvalid = true;
- return;
- }
-
- if ( response.status/1 === 422 && response.data.reason === 'LOCKED' ) {
- $scope.warnLocked = true;
- return;
- }
-
- $scope.warnErr = true;
- }); //handle error - already a user
- };
- }
- ]);
diff --git a/app/assets/javascripts/controllers/scorer.js b/app/assets/javascripts/controllers/scorer.js
index 439145ab7..b3b5da3c6 100644
--- a/app/assets/javascripts/controllers/scorer.js
+++ b/app/assets/javascripts/controllers/scorer.js
@@ -77,7 +77,7 @@ angular.module('QuepidApp')
});
});
} else {
- console.log('Is this dead code path?');
+ $log.info('Is this dead code path?');
caseSvc.saveDefaultScorer(caseNo)
.then(function() {
// TODO move to customer scorer svc, needs major updates to queriessvc first
diff --git a/app/assets/javascripts/controllers/searchResult.js b/app/assets/javascripts/controllers/searchResult.js
index eead38b60..41df0c0a4 100644
--- a/app/assets/javascripts/controllers/searchResult.js
+++ b/app/assets/javascripts/controllers/searchResult.js
@@ -68,7 +68,6 @@ angular.module('QuepidApp')
};
$scope.showDetailed = function() {
- console.log('ive been pressed');
$uibModal.open({
templateUrl: 'views/detailedExplain.html',
controller: 'DocExplainCtrl',
diff --git a/app/assets/javascripts/controllers/signup.js b/app/assets/javascripts/controllers/signup.js
deleted file mode 100644
index 9d45aa8c7..000000000
--- a/app/assets/javascripts/controllers/signup.js
+++ /dev/null
@@ -1,60 +0,0 @@
-'use strict';
-
-angular.module('QuepidSecureApp')
- .controller('SignupCtrl', [
- '$scope', '$location',
- 'signupSvc',
- 'configurationSvc',
- function ($scope, $location, signupSvc, configurationSvc) {
- $scope.hasTermsAndConditions = configurationSvc.hasTermsAndConditions();
- if (configurationSvc.hasTermsAndConditions()){
- $scope.termsAndConditionsUrl = configurationSvc.getTermsAndConditionsUrl();
- }
-
- $scope.isEmailMarketingMode = configurationSvc.isEmailMarketingMode();
- $scope.isSignupEnabled = configurationSvc.isSignupEnabled();
-
- $scope.submit = function (agree, emailMarketingAgree, name, email, pass, confirm) {
- $scope.warnAgree = false;
- $scope.warnEmail = false;
- $scope.warnPass = false;
- $scope.warnDefined = false;
- $scope.warnErr = false;
- $scope.warnName = false;
-
-
- if ( !name ) {
- $scope.warnName = true;
- return;
- }
-
- if( $scope.hasTermsAndConditions && !agree ) {
- $scope.warnAgree = true;
- return;
- }
- if( pass !== confirm ) {
- $scope.warnPass = true;
- return;
- }
-
-
- const emailVer = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
- if( !emailVer.test(email) ){
- $scope.warnEmail = true;
- return;
- }
-
- var user = {
- email: email,
- name: name,
- password: pass,
- email_marketing: emailMarketingAgree
- };
-
- signupSvc.createUser(user, function creationError() {
- $scope.warnDefined = true;
- return;
- }); //handle error - already a user
- };
- }
- ]);
diff --git a/app/assets/javascripts/controllers/wizardModal.js b/app/assets/javascripts/controllers/wizardModal.js
index 64d863778..c3ec2b2be 100644
--- a/app/assets/javascripts/controllers/wizardModal.js
+++ b/app/assets/javascripts/controllers/wizardModal.js
@@ -213,8 +213,6 @@ angular.module('QuepidApp')
angular.merge($scope.pendingWizardSettings, settingsSvc.editableSettings());
$scope.pendingWizardSettings.newQueries = [];
- console.log('User completedCaseWizard is ' + userSvc.getUser().completedCaseWizard);
-
if(userSvc.getUser().completedCaseWizard===false){
$scope.pendingWizardSettings.caseName = 'Movies Search';
// should we be setting up more here?
diff --git a/app/assets/javascripts/factories/TryFactory.js b/app/assets/javascripts/factories/TryFactory.js
index 5778b46e9..5b1b38dd7 100644
--- a/app/assets/javascripts/factories/TryFactory.js
+++ b/app/assets/javascripts/factories/TryFactory.js
@@ -6,12 +6,14 @@
angular.module('QuepidApp')
.factory('TryFactory', [
'$http',
+ '$log',
'fieldSpecSvc', 'caseTryNavSvc','varExtractorSvc',
TryFactory
]);
function TryFactory(
$http,
+ $log,
fieldSpecSvc, caseTryNavSvc, varExtractorSvc
) {
var Try = function(data) {
@@ -19,8 +21,7 @@
var self = this;
if ( angular.isUndefined(data.search_engine) ) {
- console.log('We have an undefined data.search_engine so setting to Solr, should this ever happen?');
- console.log(data);
+ $log.info('We have an undefined data.search_engine so setting to Solr, should this ever happen?');
data.search_engine = 'solr';
}
diff --git a/app/assets/javascripts/home.js b/app/assets/javascripts/home.js
index d171e9ef3..d82d618b4 100644
--- a/app/assets/javascripts/home.js
+++ b/app/assets/javascripts/home.js
@@ -1,4 +1,4 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
+// This is a manifest file that'll be compiled into home.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
@@ -60,7 +60,6 @@
//= require FileSaver.js/FileSaver
//= require urijs/src/URI
//= require utilitiesModule
-//= require secureApp
//= require app
//= require routes
//= require_tree ./components
diff --git a/app/assets/javascripts/mockBackend.js b/app/assets/javascripts/mockBackend.js
index c699ffcba..2a67dfd24 100644
--- a/app/assets/javascripts/mockBackend.js
+++ b/app/assets/javascripts/mockBackend.js
@@ -283,4 +283,4 @@ window.mockBackend = function(angModule) {
};
// declare for testing
-angular.module('QuepidTest', ['ngMock', 'ngRoute', 'QuepidApp', 'QuepidSecureApp']);
+angular.module('QuepidTest', ['ngMock', 'ngRoute', 'QuepidApp']);
diff --git a/app/assets/javascripts/secure.js b/app/assets/javascripts/secure.js
deleted file mode 100755
index 0a06b2cb1..000000000
--- a/app/assets/javascripts/secure.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// This is a manifest file that'll be compiled into secure.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery
-//= require angular/angular
-
-//= require angular-resource/angular-resource
-//= require angular-cookies/angular-cookies
-//= require angular-route/angular-route
-//= require angular-sanitize/angular-sanitize
-//= require angular-ui-bootstrap/dist/ui-bootstrap
-//= require angular-ui-bootstrap/dist/ui-bootstrap-tpls
-//= require angular-flash/dist/angular-flash.js
-//= require angular-rails-templates
-//= require utilitiesModule
-//= require secureApp
-//= require app
-//= require services/configurationSvc
-//= require services/secureRedirectSvc
-//= require services/loginSvc
-//= require services/userSvc
-//= require services/signupSvc
-//= require controllers/login
-//= require controllers/signup
-//= require controllers/404Ctrl
-//= require_tree ./interceptors
-//= require_tree ../templates
diff --git a/app/assets/javascripts/secureApp.js b/app/assets/javascripts/secureApp.js
deleted file mode 100644
index 89f2e9c09..000000000
--- a/app/assets/javascripts/secureApp.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
-
-try {
- angular.module('QuepidSecureApp');
-}
-catch (e) {
- angular.module('QuepidSecureApp', ['UtilitiesModule', 'ngRoute', 'ng-rails-csrf', 'templates'])
- .config([
- '$locationProvider', '$routeProvider',
- function ($locationProvider, $routeProvider) {
- $locationProvider.html5Mode(true);
-
- $routeProvider
- .when('/', {
- controller: 'SignupCtrl',
- templateUrl: 'views/signup.html'
- })
- .otherwise({
- templateUrl: 'views/404.html',
- controller: '404Ctrl'
- });
- }
- ]);
-}
diff --git a/app/assets/javascripts/services/bestFetcherSvc.js b/app/assets/javascripts/services/bestFetcherSvc.js
index a386918cf..8b111e54a 100644
--- a/app/assets/javascripts/services/bestFetcherSvc.js
+++ b/app/assets/javascripts/services/bestFetcherSvc.js
@@ -3,7 +3,11 @@
angular.module('QuepidApp')
.service('bestFetcherSvc', [
'docCacheSvc',
- function bestFetcherSvc(docCacheSvc) {
+ '$log',
+ function bestFetcherSvc(
+ docCacheSvc,
+ $log
+ ) {
var BestFetcher = function(ratingsStore) {
this.docs = [];
@@ -41,11 +45,11 @@ angular.module('QuepidApp')
return docB.getRating() - docA.getRating();
});
}, function(response) {
- console.log('Got an error from docCacheSvc.update: ', response);
+ $log.info('Got an error from docCacheSvc.update: ', response);
return response;
})
.catch(function(response) {
- console.log('Got an error from docCacheSvc.update: ', response);
+ $log.info('Got an error from docCacheSvc.update: ', response);
return response;
});
};
diff --git a/app/assets/javascripts/services/caseCSVSvc.js b/app/assets/javascripts/services/caseCSVSvc.js
index 0ced84f80..db45a8dc9 100644
--- a/app/assets/javascripts/services/caseCSVSvc.js
+++ b/app/assets/javascripts/services/caseCSVSvc.js
@@ -254,7 +254,10 @@
}
var firstQuery = queries[Object.keys(queries)[0]];
- var fields = firstQuery.fieldSpec().subs;
+ var fields = firstQuery.fieldSpec().fields;
+ // subtract the mandatory fields from our list of fields to be written out
+ fields.splice(fields.indexOf(firstQuery.fieldSpec().id),1);
+ fields.splice(fields.indexOf(firstQuery.fieldSpec().title),1);
if (withHeader) {
csvContent += self.detailedQueriesHeaderToCSV(fields);
@@ -276,7 +279,7 @@
infoArray.push(stringifyField(doc.getRating()));
angular.forEach(fields, function(field) {
- infoArray.push(stringifyField(doc.subs[field]));
+ infoArray.push(stringifyField(doc.doc[field]));
});
dataString = infoArray.join(',');
diff --git a/app/assets/javascripts/services/configurationSvc.js b/app/assets/javascripts/services/configurationSvc.js
index 35bf464db..ab5c0e3da 100644
--- a/app/assets/javascripts/services/configurationSvc.js
+++ b/app/assets/javascripts/services/configurationSvc.js
@@ -2,47 +2,10 @@
angular.module('UtilitiesModule')
.service('configurationSvc', [
- '$window', '$log',
function ConfigurationSvc() {
- var emailMarketingMode;
- var termsAndConditionsUrl;
- var isSignupEnabled;
var communalScorersOnly;
var queryListSortable;
- this.setEmailMarketingMode = function(val) {
- emailMarketingMode = JSON.parse(val);
- };
-
- this.isEmailMarketingMode = function() {
- return emailMarketingMode;
- };
-
- this.setTermsAndConditionsUrl = function (url) {
- termsAndConditionsUrl = url;
- };
-
- this.hasTermsAndConditions = function () {
- if (angular.isUndefined(termsAndConditionsUrl) || termsAndConditionsUrl === ''){
- return false;
- }
- else {
- return true;
- }
-
- };
-
- this.getTermsAndConditionsUrl = function () {
- return termsAndConditionsUrl;
- };
-
- this.setSignupEnabled = function (val) {
- isSignupEnabled = JSON.parse(val);
- };
-
- this.isSignupEnabled = function() {
- return isSignupEnabled;
- };
this.setCommunalScorersOnly = function(val) {
communalScorersOnly = JSON.parse(val);
diff --git a/app/assets/javascripts/services/docCacheSvc.js b/app/assets/javascripts/services/docCacheSvc.js
index 8ac54987e..2d14f2c8e 100644
--- a/app/assets/javascripts/services/docCacheSvc.js
+++ b/app/assets/javascripts/services/docCacheSvc.js
@@ -3,8 +3,13 @@
angular.module('QuepidApp')
.service('docCacheSvc', [
'$q',
+ '$log',
'docResolverSvc',
- function docCacheSvc($q, docResolverSvc) {
+ function docCacheSvc(
+ $q,
+ $log,
+ docResolverSvc
+ ) {
var docCache = {};
this.addIds = function(moreIds) {
@@ -57,11 +62,11 @@ angular.module('QuepidApp')
docCache[doc.id] = doc;
});
}, function(response) {
- console.log('Error fetching Docs in docCacheSvc: ', response);
+ $log.info('Error fetching Docs in docCacheSvc: ', response);
return response;
})
.catch(function(response) {
- console.log('Got an error from docCacheSvc: ', response);
+ $log.info('Got an error from docCacheSvc: ', response);
return response;
});
} else {
diff --git a/app/assets/javascripts/services/loginSvc.js b/app/assets/javascripts/services/loginSvc.js
deleted file mode 100644
index f22e3aa0a..000000000
--- a/app/assets/javascripts/services/loginSvc.js
+++ /dev/null
@@ -1,20 +0,0 @@
-'use strict';
-
-// When your user needs to log in.
-angular.module('QuepidSecureApp')
- .service('loginSvc', [
- '$window', '$http',
- 'secureRedirectSvc',
- function loginSvc($window, $http, secureRedirectSvc) {
- this.login = function(email, password, errorHandler, nextUrl) {
- if(!errorHandler) {
- errorHandler = function(){};
- }
-
- $http.post('/users/login', {'email':email, 'password':password})
- .then( function() {
- secureRedirectSvc.redirectToMain(nextUrl);
- }, errorHandler);
- };
- }
- ]);
diff --git a/app/assets/javascripts/services/secureRedirectSvc.js b/app/assets/javascripts/services/secureRedirectSvc.js
deleted file mode 100644
index 3deda1bd5..000000000
--- a/app/assets/javascripts/services/secureRedirectSvc.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict';
-
-angular.module('UtilitiesModule')
- .service('secureRedirectSvc', [
- '$window', '$log',
- function SecureRedirectSvc($window, $log) {
- var scheme = 'https://';
- var port = '443';
- this.debugServer = function(debugPort) {
- port = debugPort.toString();
- scheme = 'http://';
- $log.debug('USING THE DEBUG SERVER: ' + scheme + ' port: ' + port);
- };
- this.redirectToSecure = function (path) {
- $window.location = scheme + $window.location.hostname + ':' + port + '/secure' + (path || '');
- };
- this.redirectToMain = function (path) {
- $window.location = 'http://' + $window.location.host + (path || '');
- };
- }
- ]);
diff --git a/app/assets/javascripts/services/signupSvc.js b/app/assets/javascripts/services/signupSvc.js
deleted file mode 100644
index 24e1320bc..000000000
--- a/app/assets/javascripts/services/signupSvc.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-
-// When your user needs to log in.
-angular.module('QuepidSecureApp')
- .service('signupSvc', [
- '$location', '$http',
- 'loginSvc',
- function signupSvc($location, $http, loginSvc) {
- var self = this;
-
- this.signupSuccess = function(email, password) {
- return function() {
- loginSvc.login(email, password);
- };
- };
-
- this.createUser = function(user, errorHandler) {
- if(!errorHandler) {
- errorHandler = function() {};
- }
-
- user.agreed = true;
-
- var user_params = {
- user: user
- };
-
- $http.post('/api/signups', user_params)
- .then(
- self.signupSuccess(user.email, user.password),
- errorHandler
- );
- };
- }
- ]);
diff --git a/app/assets/javascripts/services/userSvc.js b/app/assets/javascripts/services/userSvc.js
index 5c0ecaa3c..13b8315d4 100644
--- a/app/assets/javascripts/services/userSvc.js
+++ b/app/assets/javascripts/services/userSvc.js
@@ -28,17 +28,6 @@ angular.module('UtilitiesModule')
self.casesInvolvedWithCount = userObj.cases_involved_with_count;
self.teamsInvolvedWithCount = userObj.teams_involved_with_count;
- this.updatePassword = function(oldPass, newPass, success, failure) {
- $http.post('/api/users/' + self.id, {
- oldPassword:oldPass,
- newPassword:newPass
- })
- .then(
- success || function(){},
- failure || function(){}
- );
- };
-
this.shownIntroWizard = function() {
var self = this;
self.introWizardSeen=true;
diff --git a/app/assets/javascripts/start.js b/app/assets/javascripts/start.js
new file mode 100644
index 000000000..9dfa9f336
--- /dev/null
+++ b/app/assets/javascripts/start.js
@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into start.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
diff --git a/app/assets/stylesheets/signup.css b/app/assets/stylesheets/signup.css
index 40a8585d3..9ac630eef 100644
--- a/app/assets/stylesheets/signup.css
+++ b/app/assets/stylesheets/signup.css
@@ -25,3 +25,42 @@ h3 {
.m-t-20 {
margin-top: 20px !important;
}
+
+/*
+ * Social Buttons for Bootstrap
+ *
+ * Copyright 2013-2016 Panayiotis Lipiridis
+ * Licensed under the MIT License
+ *
+ * https://github.com/lipis/bootstrap-social
+ */
+
+/*
+ * We only include the ones for Google and OpenId, but maybe we should include all of them!
+ */
+
+
+.btn-social{position:relative;padding-left:44px;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.btn-social>:first-child{position:absolute;left:0;top:0;bottom:0;width:32px;line-height:34px;font-size:1.6em;text-align:center;border-right:1px solid rgba(0,0,0,0.2)}
+.btn-social.btn-lg{padding-left:61px}.btn-social.btn-lg>:first-child{line-height:45px;width:45px;font-size:1.8em}
+.btn-social.btn-sm{padding-left:38px}.btn-social.btn-sm>:first-child{line-height:28px;width:28px;font-size:1.4em}
+.btn-social.btn-xs{padding-left:30px}.btn-social.btn-xs>:first-child{line-height:20px;width:20px;font-size:1.2em}
+.btn-social-icon{position:relative;padding-left:44px;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;height:34px;width:34px;padding:0}.btn-social-icon>:first-child{position:absolute;left:0;top:0;bottom:0;width:32px;line-height:34px;font-size:1.6em;text-align:center;border-right:1px solid rgba(0,0,0,0.2)}
+.btn-social-icon.btn-lg{padding-left:61px}.btn-social-icon.btn-lg>:first-child{line-height:45px;width:45px;font-size:1.8em}
+.btn-social-icon.btn-sm{padding-left:38px}.btn-social-icon.btn-sm>:first-child{line-height:28px;width:28px;font-size:1.4em}
+.btn-social-icon.btn-xs{padding-left:30px}.btn-social-icon.btn-xs>:first-child{line-height:20px;width:20px;font-size:1.2em}
+.btn-social-icon>:first-child{border:none;text-align:center;width:100% !important}
+.btn-social-icon.btn-lg{height:45px;width:45px;padding-left:0;padding-right:0}
+.btn-social-icon.btn-sm{height:30px;width:30px;padding-left:0;padding-right:0}
+.btn-social-icon.btn-xs{height:22px;width:22px;padding-left:0;padding-right:0}
+.btn-google{color:#fff;background-color:#dd4b39;border-color:rgba(0,0,0,0.2)}.btn-google:focus,.btn-google.focus{color:#fff;background-color:#c23321;border-color:rgba(0,0,0,0.2)}
+.btn-google:hover{color:#fff;background-color:#c23321;border-color:rgba(0,0,0,0.2)}
+.btn-google:active,.btn-google.active,.open>.dropdown-toggle.btn-google{color:#fff;background-color:#c23321;border-color:rgba(0,0,0,0.2)}.btn-google:active:hover,.btn-google.active:hover,.open>.dropdown-toggle.btn-google:hover,.btn-google:active:focus,.btn-google.active:focus,.open>.dropdown-toggle.btn-google:focus,.btn-google:active.focus,.btn-google.active.focus,.open>.dropdown-toggle.btn-google.focus{color:#fff;background-color:#a32b1c;border-color:rgba(0,0,0,0.2)}
+.btn-google:active,.btn-google.active,.open>.dropdown-toggle.btn-google{background-image:none}
+.btn-google.disabled:hover,.btn-google[disabled]:hover,fieldset[disabled] .btn-google:hover,.btn-google.disabled:focus,.btn-google[disabled]:focus,fieldset[disabled] .btn-google:focus,.btn-google.disabled.focus,.btn-google[disabled].focus,fieldset[disabled] .btn-google.focus{background-color:#dd4b39;border-color:rgba(0,0,0,0.2)}
+.btn-google .badge{color:#dd4b39;background-color:#fff}
+.btn-openid{color:#fff;background-color:#f7931e;border-color:rgba(0,0,0,0.2)}.btn-openid:focus,.btn-openid.focus{color:#fff;background-color:#da7908;border-color:rgba(0,0,0,0.2)}
+.btn-openid:hover{color:#fff;background-color:#da7908;border-color:rgba(0,0,0,0.2)}
+.btn-openid:active,.btn-openid.active,.open>.dropdown-toggle.btn-openid{color:#fff;background-color:#da7908;border-color:rgba(0,0,0,0.2)}.btn-openid:active:hover,.btn-openid.active:hover,.open>.dropdown-toggle.btn-openid:hover,.btn-openid:active:focus,.btn-openid.active:focus,.open>.dropdown-toggle.btn-openid:focus,.btn-openid:active.focus,.btn-openid.active.focus,.open>.dropdown-toggle.btn-openid.focus{color:#fff;background-color:#b86607;border-color:rgba(0,0,0,0.2)}
+.btn-openid:active,.btn-openid.active,.open>.dropdown-toggle.btn-openid{background-image:none}
+.btn-openid.disabled:hover,.btn-openid[disabled]:hover,fieldset[disabled] .btn-openid:hover,.btn-openid.disabled:focus,.btn-openid[disabled]:focus,fieldset[disabled] .btn-openid:focus,.btn-openid.disabled.focus,.btn-openid[disabled].focus,fieldset[disabled] .btn-openid.focus{background-color:#f7931e;border-color:rgba(0,0,0,0.2)}
+.btn-openid .badge{color:#f7931e;background-color:#fff}
diff --git a/app/assets/stylesheets/secure.css.scss b/app/assets/stylesheets/start.css.scss
old mode 100755
new mode 100644
similarity index 51%
rename from app/assets/stylesheets/secure.css.scss
rename to app/assets/stylesheets/start.css.scss
index ec586dd54..ed7e31216
--- a/app/assets/stylesheets/secure.css.scss
+++ b/app/assets/stylesheets/start.css.scss
@@ -1,11 +1,14 @@
/*
- * This is a manifest file that'll be compiled into secure.css, which will include all the files
+ * This is a manifest file that'll be compiled into start.css, which will include all the files
* listed below.
*/
@import "style";
@import "bootstrap";
+@import "font-awesome-sprockets";
+@import "font-awesome";
+
@import "cookies_eu";
@import "fonts";
diff --git a/app/assets/templates/views/detailedDoc.html b/app/assets/templates/views/detailedDoc.html
index cf440d479..e9ce4e233 100644
--- a/app/assets/templates/views/detailedDoc.html
+++ b/app/assets/templates/views/detailedDoc.html
@@ -23,6 +23,25 @@ + + Detailed export is only supported from the individual Case view. +
CSV file withTeam Name,Case Name,Case ID,Query Text,Doc ID,Title,Rating,Field1,...,FieldN where Field1,...,FieldN are specified under Settings in the Displayed Fields field.
@@ -74,5 +78,5 @@ Export Case: {{ ctrl.theCase.ca
{{doc.title}}
+
+
+
+ {{fieldName}}
+ {{fieldValue}}
+
+
+
+ {{fieldName}}
+ {{fieldValue}}
+
+
+ Thumb
+ {{doc.thumb}}
+
+
+
View Document
diff --git a/app/assets/templates/views/queriesLayout.html b/app/assets/templates/views/queriesLayout.html
index bfe3d81ca..bff2fc3ca 100644
--- a/app/assets/templates/views/queriesLayout.html
+++ b/app/assets/templates/views/queriesLayout.html
@@ -98,6 +98,7 @@ Image
+ {{doc.image}}
+
-
diff --git a/app/assets/templates/views/teams/show.html b/app/assets/templates/views/teams/show.html
index 90e7a26e7..042f938e7 100644
--- a/app/assets/templates/views/teams/show.html
+++ b/app/assets/templates/views/teams/show.html
@@ -14,6 +14,7 @@
-
-
-
-
-
- Login
-
-
-
-
-
-
- OR
-
-
-
-
-
-
-
-
-
- - Read more about the Quepid story. Contact us - to talk about Quepid or ask how we can help with your search problems! -
-Team: {{ currentTeam.name }}
ng-src="{{ currentTeam.owner.avatar_url }}" class="img-responsive img-rounded" alt="{{ currentTeam.owner.display_name }}" + width="96" height="96" />
diff --git a/app/assets/templates/views/wizardModal.html b/app/assets/templates/views/wizardModal.html
index d7bc2efa0..c4634f1dc 100644
--- a/app/assets/templates/views/wizardModal.html
+++ b/app/assets/templates/views/wizardModal.html
@@ -53,9 +53,8 @@ Solr or Elasticsearch?
- Do you see any errors when you visit your Solr URL directly?
- - Will your request handler accept the JSONP writer type? Or does it only return XML or JSON?
-
- If you are using Solr 8.4 or later, you may need to tweak the content-type being set by
wt=json.
+ If you are using a version of Solr between 8.4 and 9.0, you may need to tweak the content-type being set by wt=json.
You can do this via the below curl command:
curl -X POST -H 'Content-type:application/json' -d '{
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
new file mode 100644
index 000000000..9aec23053
--- /dev/null
+++ b/app/channels/application_cable/channel.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module ApplicationCable
+ class Channel < ActionCable::Channel::Base
+ end
+end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
new file mode 100644
index 000000000..8d6c2a1bf
--- /dev/null
+++ b/app/channels/application_cable/connection.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module ApplicationCable
+ class Connection < ActionCable::Connection::Base
+ end
+end
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 769013881..8b4a191e4 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,8 +1,6 @@
# frozen_string_literal: true
class AccountsController < ApplicationController
- force_ssl if: :ssl_enabled?
-
# rubocop:disable Metrics/MethodLength
def update
@user = current_user
@@ -41,7 +39,7 @@ def destroy
respond_to do |format|
if @user.destroy
- format.html { redirect_to secure_url, notice: 'Account was deleted' }
+ format.html { redirect_to sessions_path, notice: 'Account was deleted' }
format.json { head :no_content }
else
format.html { render 'profiles/show' }
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index f8835c6df..06065b78b 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -70,11 +70,13 @@ def set_user
@user = User.find(params[:id])
end
- # Never trust parameters from the scary internet, only allow the white list through.
+ # Never trust parameters from the scary internet, only allow the permitted list through.
def user_params
params.require(:user).permit(
:administrator,
- :email
+ :email,
+ :password,
+ :password_confirmation
)
end
end
diff --git a/app/controllers/api/v1/cases/dropdown_controller.rb b/app/controllers/api/v1/cases/dropdown_controller.rb
index 90fe85777..8ff92168b 100644
--- a/app/controllers/api/v1/cases/dropdown_controller.rb
+++ b/app/controllers/api/v1/cases/dropdown_controller.rb
@@ -19,7 +19,7 @@ def index
LEFT OUTER JOIN `teams` ON `teams`.`id` = `teams_cases`.`team_id`
LEFT OUTER JOIN `teams_members` ON `teams_members`.`team_id` = `teams`.`id`
LEFT OUTER JOIN `users` ON `users`.`id` = `teams_members`.`member_id`
- WHERE (`teams_members`.`member_id` = #{current_user.id} OR `cases`.`user_id` = #{current_user.id})
+ WHERE (`teams_members`.`member_id` = #{current_user.id} OR `cases`.`owner_id` = #{current_user.id})
AND (`cases`.`archived` = false OR `cases`.`archived` IS NULL)
ORDER BY `case_metadata`.`last_viewed_at` DESC, `cases`.`id` DESC
LIMIT 3
diff --git a/app/controllers/api/v1/cases_controller.rb b/app/controllers/api/v1/cases_controller.rb
index be29327b8..0f19f795f 100644
--- a/app/controllers/api/v1/cases_controller.rb
+++ b/app/controllers/api/v1/cases_controller.rb
@@ -20,7 +20,7 @@ def index
if archived
@no_tries = true
@no_teams = true
- @cases = Case.where(archived: archived, user_id: current_user.id).all
+ @cases = Case.where(archived: archived, owner_id: current_user.id).all
else
@cases = if 'last_viewed_at' == sort_by
current_user.cases_involved_with.not_archived.includes(:metadata).references(:metadata)
diff --git a/app/controllers/api/v1/export/ratings_controller.rb b/app/controllers/api/v1/export/ratings_controller.rb
index 26c2b2cee..f43f2d273 100644
--- a/app/controllers/api/v1/export/ratings_controller.rb
+++ b/app/controllers/api/v1/export/ratings_controller.rb
@@ -27,9 +27,9 @@ def show
respond_to do |format|
format.json do
- json_template = file_format.nil? ? 'show.json.jbuilder' : "show.#{file_format.downcase}.json.jbuilder"
+ json_template = file_format.nil? ? 'show' : "show_#{file_format.downcase}"
- render json_template
+ render json_template, formats: :json
end
format.csv do
# We have crazy rendering formatting in the view because we don't want a trailing LF at the end of the
diff --git a/app/controllers/api/v1/import/ratings_controller.rb b/app/controllers/api/v1/import/ratings_controller.rb
index f28b5774e..cc5761732 100644
--- a/app/controllers/api/v1/import/ratings_controller.rb
+++ b/app/controllers/api/v1/import/ratings_controller.rb
@@ -81,7 +81,7 @@ def create
rescue Exception => e
# TODO: report this to logging infrastructure so we won't lose any important
# errors that we might have to fix.
- Rails.logger.debug "Import ratings failed: #{e.inspect}"
+ Rails.logger.debug { "Import ratings failed: #{e.inspect}" }
render json: { message: e.message }, status: :bad_request
end
diff --git a/app/controllers/api/v1/teams_controller.rb b/app/controllers/api/v1/teams_controller.rb
index 9ffd2116e..13971df39 100644
--- a/app/controllers/api/v1/teams_controller.rb
+++ b/app/controllers/api/v1/teams_controller.rb
@@ -12,7 +12,7 @@ def index
# @teams = current_user.teams_im_in
# @teams = @teams.preload(:scorers, :members, :cases, :owner).all
# There may be some more fields we could include...
- @teams = current_user.teams.includes( :owner, :members, :teams_scorers, :cases, scorers: [ :teams ] ).all
+ @teams = current_user.teams.includes( :owner, :members, :cases, scorers: [ :teams ] ).all
respond_with @teams
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3167f50b3..7d4b575ad 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -20,10 +20,6 @@ class ApplicationController < ActionController::Base
private
- def ssl_enabled?
- 'true' == ENV['FORCE_SSL']
- end
-
def signup_enabled?
Rails.application.config.signup_enabled
end
diff --git a/app/controllers/concerns/authentication/current_user_manager.rb b/app/controllers/concerns/authentication/current_user_manager.rb
index db1cdd1f8..b17208bd6 100644
--- a/app/controllers/concerns/authentication/current_user_manager.rb
+++ b/app/controllers/concerns/authentication/current_user_manager.rb
@@ -43,7 +43,7 @@ def set_current_user
end
def require_login
- redirect_to secure_path unless @current_user
+ redirect_to sessions_path unless @current_user
end
def auto_login user
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index be17929ce..14609a683 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,6 +1,10 @@
# frozen_string_literal: true
class HomeController < ApplicationController
+ # If Quepid is running on HTTPS, like on Heroku, then it needs to switch
+ # to HTTP in order to make calls to a Solr that is running in HTTP as well, otherwise
+ # you get this "Mixed Content", which browsers block as a security issue.
+ # https://developer.mozilla.org/en-US/docs/Web/Security/Mixed_content
before_action :redirect_to_non_ssl
def index
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 854497c2a..547925bf0 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class ProfilesController < ApplicationController
- force_ssl if: :ssl_enabled?
layout 'account'
def show; end
diff --git a/app/controllers/secure_controller.rb b/app/controllers/secure_controller.rb
index ba9b7812d..588fbc127 100644
--- a/app/controllers/secure_controller.rb
+++ b/app/controllers/secure_controller.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class SecureController < ApplicationController
- force_ssl if: :ssl_enabled?
skip_before_action :require_login
def index
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 3d49abd89..79528efee 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,17 +1,32 @@
# frozen_string_literal: true
class SessionsController < ApplicationController
- force_ssl if: :ssl_enabled?
- skip_before_action :require_login, only: :create
+ skip_before_action :require_login, only: [ :create, :index ]
skip_before_action :check_current_user_locked!, only: :create
skip_before_action :verify_authenticity_token, only: :create
+ layout 'start'
+
+ def index
+ @user = User.new
+ end
+
def create
- user = login(params[:email], params[:password])
+ login_params = user_params
+
+ @user = login(login_params[:email], login_params[:password])
respond_to do |format|
- if user
+ if @user
+ format.html { redirect_to root_path }
format.json { render json: { message: 'connected' }, status: :ok }
else
+ @user = User.new(email: login_params[:email])
+
+ # rubocop:disable Layout/LineLength
+ @user.errors.add(:base,
+ 'Unknown email/password combo. Double check you have the correct email address and password, or sign up for a new account.' )
+ # rubocop:enable Layout/LineLength
+ format.html { render :index }
format.json { render json: { reason: @error }, status: :unprocessable_entity }
end
end
@@ -20,7 +35,7 @@ def create
def destroy
clear_user_session
- redirect_to secure_path
+ redirect_to sessions_path
end
private
@@ -51,4 +66,8 @@ def login email, password
user
end
+
+ def user_params
+ params.require(:user).permit(:email, :password)
+ end
end
diff --git a/app/controllers/users/invitations_controller.rb b/app/controllers/users/invitations_controller.rb
index 3b8ca8f42..e76830b42 100644
--- a/app/controllers/users/invitations_controller.rb
+++ b/app/controllers/users/invitations_controller.rb
@@ -2,10 +2,9 @@
module Users
class InvitationsController < Devise::InvitationsController
- force_ssl if: :ssl_enabled?
skip_before_action :require_login, only: [ :edit, :update ]
- layout 'secure'
+ layout 'start'
# Intercepts the login path and redirects the user to their
# Team page as their first page after joining Quepid!
@@ -16,7 +15,7 @@ def after_accept_path_for resource
def update
unless signup_enabled?
flash.now[:error] = 'Signups are disabled.'
- redirect_to secure_path and return
+ redirect_to sessions_path and return
end
super
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
new file mode 100644
index 000000000..67eb3ad29
--- /dev/null
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Users
+ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+ skip_before_action :require_login, only: [ :keycloakopenid, :google_oauth2, :failure ]
+
+ # rubocop:disable Metrics/AbcSize
+ def keycloakopenid
+ Rails.logger.debug(request.env['omniauth.auth'])
+ @user = create_user_from_omniauth(request.env['omniauth.auth'])
+ @user.errors.add(:base, "Can't log in a locked user." ) if @user.locked
+ if @user.persisted? & !@user.locked
+ session[:current_user_id] = @user.id # this populates our session variable.
+
+ # in this flow, we have a new user joining, so we create a empty case for them, which
+ # on the home_controller.rb triggers the bootstrap and the new case wizard.
+ @user.cases.build case_name: "Case #{@user.cases.size}"
+
+ # sign_in_and_redirect @user, event: :authentication
+ redirect_to root_path
+ else
+ Rails.logger.warn('user not persisted, what do we need to do?')
+ session['devise.keycloakopenid_data'] = request.env['omniauth.auth']
+ redirect_to new_user_registration_url
+ end
+ end
+
+ def google_oauth2
+ Rails.logger.debug(request.env['omniauth.auth'])
+ @user = create_user_from_omniauth(request.env['omniauth.auth'])
+ @user.errors.add(:base, "Can't log in a locked user." ) if @user.locked
+ if @user.errors.empty?
+ session[:current_user_id] = @user.id # this populates our session variable.
+
+ # in this flow, we have a new user joining, so we create a empty case for them, which
+ # on the home_controller.rb triggers the bootstrap and the new case wizard.
+ @user.cases.build case_name: "Case #{@user.cases.size}"
+
+ redirect_to root_path
+ # sign_in_and_redirect @user, event: :authentication
+ else
+ # Removing extra as it can overflow some session stores
+ session['devise.google_data'] = request.env['omniauth.auth'].except('extra')
+ redirect_to root_path, alert: @user.errors.full_messages.join("\n") if @user
+ end
+ end
+ # rubocop:enable Metrics/AbcSize
+
+ def failure
+ redirect_to root_path, alert: 'Could not sign user in with OAuth provider.'
+ end
+
+ private
+
+ # rubocop:disable Metrics/AbcSize
+ # rubocop:disable Metrics/MethodLength
+ def create_user_from_omniauth auth
+ if Rails.application.config.signup_enabled
+ user = User.find_or_initialize_by(email: auth['info']['email'])
+ else
+ user = User.find_by(email: auth['info']['email'])
+ if user.nil? # we looked for a existing user account and didn't find it
+ user = User.new(email: auth['info']['email'])
+ user.errors.add(:base, 'You can only sign in with already created users.' )
+ end
+ end
+
+ user.name = auth['info']['name']
+ user.password = 'fake' if user.password.blank? # If you don't have a password, fake it.
+ user.agreed = true
+
+ user.num_logins ||= 0
+ user.num_logins += 1
+
+ user.profile_pic = auth['info']['image']
+ # user.access_token = auth['credentials']['token']
+ # user.refresh_token = auth['credentials']['refresh_token'] unless auth['credentials']['refresh_token'].nil?
+ # user.expires_at = auth['credentials']['expires_at'] unless auth['credentials']['refresh_token'].nil?
+ user.save! if user.errors.empty?
+ user
+ end
+ # rubocop:enable Metrics/AbcSize
+ # rubocop:enable Metrics/MethodLength
+ end
+end
diff --git a/app/controllers/users/passwords_controller.rb b/app/controllers/users/passwords_controller.rb
index fbddfff95..22cd1d763 100644
--- a/app/controllers/users/passwords_controller.rb
+++ b/app/controllers/users/passwords_controller.rb
@@ -4,13 +4,12 @@ module Users
class PasswordsController < Devise::PasswordsController
include NotificationsManager
- force_ssl if: :ssl_enabled?
skip_before_action :require_login
skip_before_action :require_no_authentication
before_action :check_email
- layout 'secure'
+ layout 'start'
# GET /resource/password/new
# def new
diff --git a/app/controllers/users/signups_controller.rb b/app/controllers/users/signups_controller.rb
new file mode 100644
index 000000000..4944933a1
--- /dev/null
+++ b/app/controllers/users/signups_controller.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Users
+ class SignupsController < ApplicationController
+ skip_before_action :require_login
+ layout 'start'
+
+ # rubocop:disable Metrics/MethodLength
+ def create
+ user_params_to_save = user_params
+
+ # Check if we already have an invite out for this user, and if so let's use that
+ if user_params_to_save[:email].blank?
+ @user = User.new user_params_to_save
+ else
+ @user = User.where(email: user_params_to_save[:email]).where.not(invitation_token: nil).first
+ if @user
+ @user.assign_attributes(user_params_to_save)
+ else
+ @user = User.new user_params_to_save
+ # in this flow, we have a new user joining, so we create a empty case for them, which
+ # on the home_controller.rb triggers the bootstrap and the new case wizard.
+ @user.cases.build case_name: "Case #{@user.cases.size}"
+ end
+ end
+
+ respond_to do |format|
+ format.html do
+ if @user.save
+ session[:current_user_id] = @user.id # not sure if we need to do more here?
+ Analytics::Tracker.track_signup_event @user
+ redirect_to root_path
+ else
+ render template: 'sessions/index'
+ end
+ end
+ format.js
+ end
+ # respond_to do |format|
+ # if @user.save
+ # session[:current_user_id] = @user.id # not sure if we need to do more here?
+ # Analytics::Tracker.track_signup_event @user
+ # format.html { redirect_to root_path }
+ # else
+ # format.html { render template: 'sessions/index' }
+ # end
+ # end
+ end
+ # rubocop:enable Metrics/MethodLength
+
+ private
+
+ def user_params
+ params.require(:user).permit(
+ :name,
+ :email,
+ :password,
+ :password_confirmation,
+ :agreed,
+ :email_marketing
+ )
+ end
+ end
+end
diff --git a/app/helpers/devise_helper.rb b/app/helpers/devise_helper.rb
index f03c7c4f2..d7fd97ec6 100644
--- a/app/helpers/devise_helper.rb
+++ b/app/helpers/devise_helper.rb
@@ -20,7 +20,7 @@ def devise_error_messages!
end
def devise_error_messages?
- resource.errors.empty? ? false : true
+ !resource.errors.empty?
end
def devise_reset_password_error_messages
diff --git a/app/javascripts/channels/consumer.js b/app/javascripts/channels/consumer.js
new file mode 100644
index 000000000..8ec3aad3a
--- /dev/null
+++ b/app/javascripts/channels/consumer.js
@@ -0,0 +1,6 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the `bin/rails generate channel` command.
+
+import { createConsumer } from "@rails/actioncable"
+
+export default createConsumer()
diff --git a/app/javascripts/channels/index.js b/app/javascripts/channels/index.js
new file mode 100644
index 000000000..0cfcf7491
--- /dev/null
+++ b/app/javascripts/channels/index.js
@@ -0,0 +1,5 @@
+// Load all the channels within this directory and all subdirectories.
+// Channel files must be named *_channel.js.
+
+const channels = require.context('.', true, /_channel\.js$/)
+channels.keys().forEach(channels)
diff --git a/app/javascripts/packs/application.js b/app/javascripts/packs/application.js
new file mode 100644
index 000000000..f710851a8
--- /dev/null
+++ b/app/javascripts/packs/application.js
@@ -0,0 +1,13 @@
+// This file is automatically compiled by Webpack, along with any other files
+// present in this directory. You're encouraged to place your actual application logic in
+// a relevant structure within app/javascript and only use these pack files to reference
+// that code so it'll be compiled.
+
+import Rails from "@rails/ujs"
+import Turbolinks from "turbolinks"
+import * as ActiveStorage from "@rails/activestorage"
+import "channels"
+
+Rails.start()
+Turbolinks.start()
+ActiveStorage.start()
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
index d92ffddcb..bef395997 100644
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@@ -1,4 +1,9 @@
# frozen_string_literal: true
class ApplicationJob < ActiveJob::Base
+ # Automatically retry jobs that encountered a deadlock
+ # retry_on ActiveRecord::Deadlocked
+
+ # Most jobs are safe to ignore if the underlying records are no longer available
+ # discard_on ActiveJob::DeserializationError
end
diff --git a/app/jobs/google_analytics_event_job.rb b/app/jobs/google_analytics_event_job.rb
index ff70afed3..a261de255 100644
--- a/app/jobs/google_analytics_event_job.rb
+++ b/app/jobs/google_analytics_event_job.rb
@@ -4,9 +4,9 @@ class GoogleAnalyticsEventJob < ApplicationJob
queue_as :default
def perform data
- return unless Analytics::GA.enabled?
+ return unless Analytics::GoogleAnalytics.enabled?
- Analytics::GA.ga.event(
+ Analytics::GoogleAnalytics.ga.event(
data[:category],
data[:action],
data[:label],
diff --git a/app/models/case.rb b/app/models/case.rb
index 5fac5dd1c..d09e6b6ca 100644
--- a/app/models/case.rb
+++ b/app/models/case.rb
@@ -9,7 +9,7 @@
# search_url :string(500)
# field_spec :string(500)
# last_try_number :integer
-# user_id :integer
+# owner_id :integer
# archived :boolean
# scorer_id :integer
# created_at :datetime not null
@@ -27,7 +27,8 @@ class Case < ApplicationRecord
belongs_to :scorer, optional: true
- belongs_to :user, optional: true
+ belongs_to :owner,
+ class_name: 'User', optional: true
has_many :tries, -> { order(try_number: :desc) },
dependent: :destroy,
@@ -36,7 +37,7 @@ class Case < ApplicationRecord
has_many :metadata,
dependent: :destroy
- # has_many :ratings, # wed ont' actually need htis.
+ # has_many :ratings, # we don't actually need this.
# through: :queries
# rubocop:disable Rails/InverseOf
@@ -84,7 +85,7 @@ class Case < ApplicationRecord
scope :for_user_directly_owned, ->(user) {
where('
- `cases`.`user_id` = ?
+ `cases`.`owner_id` = ?
', user.id)
}
@@ -106,7 +107,7 @@ def really_destroy
# rubocop:disable Metrics/ParameterLists
def clone_case original_case, user, try: nil, clone_queries: false, clone_ratings: false, preserve_history: false
transaction do
- self.user = user
+ self.owner = user
if preserve_history
original_case.tries.each do |a_try|
@@ -153,8 +154,8 @@ def last_score
def set_scorer
return if scorer_id.present?
- self.scorer = if user&.default_scorer
- user.default_scorer
+ self.scorer = if owner&.default_scorer
+ owner.default_scorer
else
Scorer.system_default_scorer
end
diff --git a/app/models/concerns/profile.rb b/app/models/concerns/profile.rb
index 5e77378c9..0f23cc85f 100644
--- a/app/models/concerns/profile.rb
+++ b/app/models/concerns/profile.rb
@@ -12,9 +12,13 @@ module Profile
}.freeze
def avatar_url size = :small
- gravatar_id = Digest::MD5.hexdigest(email.downcase)
- gravatar_size = size_to_number size
- "https://secure.gravatar.com/avatar/#{gravatar_id}.png?s=#{gravatar_size}&d=retro"
+ if profile_pic.present?
+ profile_pic
+ else
+ gravatar_id = Digest::MD5.hexdigest(email.downcase)
+ gravatar_size = size_to_number size
+ "https://secure.gravatar.com/avatar/#{gravatar_id}.png?s=#{gravatar_size}&d=retro"
+ end
end
def display_name
diff --git a/app/models/try.rb b/app/models/try.rb
index 5efd1956e..e9d3d919a 100644
--- a/app/models/try.rb
+++ b/app/models/try.rb
@@ -81,7 +81,7 @@ def add_curator_vars vars = {}
end
def curator_vars_map
- Hash[curator_variables.map { |each| [ each.name.to_sym, each.value ] }]
+ curator_variables.map { |each| [ each.name.to_sym, each.value ] }.to_h
end
def solr_args
diff --git a/app/models/user.rb b/app/models/user.rb
index 09aa2b289..ddde88683 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -30,8 +30,13 @@ class User < ApplicationRecord
# Associations
belongs_to :default_scorer, class_name: 'Scorer', optional: true # for communal scorers there isn't a owner
+ # has_many :cases,
+ # dependent: :nullify # sometimes a case belongs to a team, so don't just delete it.
has_many :cases,
- dependent: :nullify # sometimes a case belongs to a team, so don't just delete it.
+ class_name: 'Case',
+ foreign_key: :owner_id,
+ inverse_of: :owner,
+ dependent: :nullify
has_many :queries, through: :cases
@@ -91,7 +96,7 @@ class User < ApplicationRecord
validates_with ::DefaultScorerExistsValidator
validates :agreed,
- acceptance: { message: 'You must agree to the terms and conditions.' },
+ acceptance: { message: 'checkbox must be clicked to signify you agree to the terms and conditions.' },
if: :terms_and_conditions?
def terms_and_conditions?
@@ -128,7 +133,9 @@ def check_scorer_ownership_before_removing!
# :confirmable, :lockable, :timeoutable and :omniauthable
# devise :invitable, :database_authenticatable, :registerable,
# :recoverable, :rememberable, :trackable, :validatable
- devise :invitable, :recoverable, reset_password_keys: [ :email ]
+ devise :invitable, :recoverable, :omniauthable, omniauth_providers: [ :keycloakopenid, :google_oauth2 ]
+ # devise :omniauthable, omniauth_providers: %i[keycloakopenid]
+ # devise :invitable, :recoverable, :omniauthable
# Devise hacks since we only use the recoverable module
attr_accessor :password_confirmation
diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb
index f7f67a614..5c1d7622e 100644
--- a/app/views/admin/users/_form.html.erb
+++ b/app/views/admin/users/_form.html.erb
@@ -1,4 +1,7 @@
-
+
+
<%= form_for(@user, url: admin_user_path(@user), class: 'form-horizontal') do |f| %>
<% if @user.errors.any? %>
@@ -31,9 +34,44 @@
-
- <%= f.submit class: 'btn btn-primary' %>
-
+ <%= f.submit class: 'btn btn-primary btn-lg' %>
<% end %>
+
+
+
+
+<%= form_for(@user, url: admin_user_path(@user), class: 'form-horizontal') do |f| %>
+
+
+ <% if @user.errors.any? %>
+
+ <%= pluralize(@user.errors.count, "error") %> prohibited this from being saved:
+
+
+ <% @user.errors.full_messages.each do |message| %>
+ - <%= message %>
+ <% end %>
+
+
+ <% end %>
+
+
+ <%= f.label :password, class: 'control-label' %>
+ <%= f.password_field :password, class: 'form-control input-lg', placeholder: 'New Password' %>
+
+
+
+
+ <%= f.label :password_confirmation, class: 'control-label' %>
+ <%= f.password_field :password_confirmation, class: 'form-control input-lg', placeholder: 'Confirm New Password' %>
+
+
+
+
+
+ <% end %>
+
diff --git a/app/views/admin/users/_member.html.erb b/app/views/admin/users/_member.html.erb
deleted file mode 100644
index d586de2d0..000000000
--- a/app/views/admin/users/_member.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
- -
- <%= image_tag member.avatar_url %>
- <%= member.display_name %>
- <% if member == current_user %>
- You
- <% end %>
-
diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb
index 486b88eff..27956d877 100644
--- a/app/views/admin/users/edit.html.erb
+++ b/app/views/admin/users/edit.html.erb
@@ -1,7 +1,8 @@
Editing User
-
+
<%= render 'form' %>
+
<%= link_to 'Show', admin_user_path(@user) %> |
<%= link_to 'Back', admin_users_path %>
diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb
index bc04e4836..01356455a 100644
--- a/app/views/admin/users/show.html.erb
+++ b/app/views/admin/users/show.html.erb
@@ -3,6 +3,7 @@
<%= @user.display_name %>
<%= notice %>
+ <%= image_tag @user.avatar_url(:big), size:'96x96', class:'img-rounded' %>
diff --git a/app/views/api/v1/cases/_case.json.jbuilder b/app/views/api/v1/cases/_case.json.jbuilder
index 36516eec5..c8ab56c80 100644
--- a/app/views/api/v1/cases/_case.json.jbuilder
+++ b/app/views/api/v1/cases/_case.json.jbuilder
@@ -9,8 +9,8 @@ teams = acase.teams.find_all { |t| current_user.teams.all.include?(t) } unless n
json.case_name acase.case_name
json.caseNo acase.id
json.scorerId acase.scorer_id
-json.owned acase.user_id == current_user.id
-json.owner_name acase.user.name unless acase.user.nil?
+json.owned acase.owner_id == current_user.id
+json.owner_name acase.owner.name if acase.owner.present?
json.queriesCount acase.queries.count
json.teams teams unless no_teams
diff --git a/app/views/api/v1/cases/dropdown/index.json.jbuilder b/app/views/api/v1/cases/dropdown/index.json.jbuilder
index f56438dcd..1c3df21ea 100644
--- a/app/views/api/v1/cases/dropdown/index.json.jbuilder
+++ b/app/views/api/v1/cases/dropdown/index.json.jbuilder
@@ -4,7 +4,7 @@ json.allCases do
json.array! @cases do |acase|
json.case_name acase.case_name
json.caseNo acase.id
- json.owned acase.user_id == current_user.id
+ json.owned acase.owner_id == current_user.id
json.last_try_number acase.tries.best.try_number if acase.tries.present? && acase.tries.best.present?
end
diff --git a/app/views/api/v1/export/ratings/show.rre.json.jbuilder b/app/views/api/v1/export/ratings/show_rre.json.jbuilder
similarity index 100%
rename from app/views/api/v1/export/ratings/show.rre.json.jbuilder
rename to app/views/api/v1/export/ratings/show_rre.json.jbuilder
diff --git a/app/views/layouts/_common_js.html.erb b/app/views/layouts/_common_js.html.erb
index 55d673c0d..054570c57 100644
--- a/app/views/layouts/_common_js.html.erb
+++ b/app/views/layouts/_common_js.html.erb
@@ -1,11 +1,11 @@
-<% if Analytics::GA.enabled? %>
+<% if Analytics::GoogleAnalytics.enabled? %>
wt=json.
+ If you are using a version of Solr between 8.4 and 9.0, you may need to tweak the content-type being set by wt=json.
You can do this via the below curl command:
curl -X POST -H 'Content-type:application/json' -d '{
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
new file mode 100644
index 000000000..9aec23053
--- /dev/null
+++ b/app/channels/application_cable/channel.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module ApplicationCable
+ class Channel < ActionCable::Channel::Base
+ end
+end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
new file mode 100644
index 000000000..8d6c2a1bf
--- /dev/null
+++ b/app/channels/application_cable/connection.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module ApplicationCable
+ class Connection < ActionCable::Connection::Base
+ end
+end
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 769013881..8b4a191e4 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,8 +1,6 @@
# frozen_string_literal: true
class AccountsController < ApplicationController
- force_ssl if: :ssl_enabled?
-
# rubocop:disable Metrics/MethodLength
def update
@user = current_user
@@ -41,7 +39,7 @@ def destroy
respond_to do |format|
if @user.destroy
- format.html { redirect_to secure_url, notice: 'Account was deleted' }
+ format.html { redirect_to sessions_path, notice: 'Account was deleted' }
format.json { head :no_content }
else
format.html { render 'profiles/show' }
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index f8835c6df..06065b78b 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -70,11 +70,13 @@ def set_user
@user = User.find(params[:id])
end
- # Never trust parameters from the scary internet, only allow the white list through.
+ # Never trust parameters from the scary internet, only allow the permitted list through.
def user_params
params.require(:user).permit(
:administrator,
- :email
+ :email,
+ :password,
+ :password_confirmation
)
end
end
diff --git a/app/controllers/api/v1/cases/dropdown_controller.rb b/app/controllers/api/v1/cases/dropdown_controller.rb
index 90fe85777..8ff92168b 100644
--- a/app/controllers/api/v1/cases/dropdown_controller.rb
+++ b/app/controllers/api/v1/cases/dropdown_controller.rb
@@ -19,7 +19,7 @@ def index
LEFT OUTER JOIN `teams` ON `teams`.`id` = `teams_cases`.`team_id`
LEFT OUTER JOIN `teams_members` ON `teams_members`.`team_id` = `teams`.`id`
LEFT OUTER JOIN `users` ON `users`.`id` = `teams_members`.`member_id`
- WHERE (`teams_members`.`member_id` = #{current_user.id} OR `cases`.`user_id` = #{current_user.id})
+ WHERE (`teams_members`.`member_id` = #{current_user.id} OR `cases`.`owner_id` = #{current_user.id})
AND (`cases`.`archived` = false OR `cases`.`archived` IS NULL)
ORDER BY `case_metadata`.`last_viewed_at` DESC, `cases`.`id` DESC
LIMIT 3
diff --git a/app/controllers/api/v1/cases_controller.rb b/app/controllers/api/v1/cases_controller.rb
index be29327b8..0f19f795f 100644
--- a/app/controllers/api/v1/cases_controller.rb
+++ b/app/controllers/api/v1/cases_controller.rb
@@ -20,7 +20,7 @@ def index
if archived
@no_tries = true
@no_teams = true
- @cases = Case.where(archived: archived, user_id: current_user.id).all
+ @cases = Case.where(archived: archived, owner_id: current_user.id).all
else
@cases = if 'last_viewed_at' == sort_by
current_user.cases_involved_with.not_archived.includes(:metadata).references(:metadata)
diff --git a/app/controllers/api/v1/export/ratings_controller.rb b/app/controllers/api/v1/export/ratings_controller.rb
index 26c2b2cee..f43f2d273 100644
--- a/app/controllers/api/v1/export/ratings_controller.rb
+++ b/app/controllers/api/v1/export/ratings_controller.rb
@@ -27,9 +27,9 @@ def show
respond_to do |format|
format.json do
- json_template = file_format.nil? ? 'show.json.jbuilder' : "show.#{file_format.downcase}.json.jbuilder"
+ json_template = file_format.nil? ? 'show' : "show_#{file_format.downcase}"
- render json_template
+ render json_template, formats: :json
end
format.csv do
# We have crazy rendering formatting in the view because we don't want a trailing LF at the end of the
diff --git a/app/controllers/api/v1/import/ratings_controller.rb b/app/controllers/api/v1/import/ratings_controller.rb
index f28b5774e..cc5761732 100644
--- a/app/controllers/api/v1/import/ratings_controller.rb
+++ b/app/controllers/api/v1/import/ratings_controller.rb
@@ -81,7 +81,7 @@ def create
rescue Exception => e
# TODO: report this to logging infrastructure so we won't lose any important
# errors that we might have to fix.
- Rails.logger.debug "Import ratings failed: #{e.inspect}"
+ Rails.logger.debug { "Import ratings failed: #{e.inspect}" }
render json: { message: e.message }, status: :bad_request
end
diff --git a/app/controllers/api/v1/teams_controller.rb b/app/controllers/api/v1/teams_controller.rb
index 9ffd2116e..13971df39 100644
--- a/app/controllers/api/v1/teams_controller.rb
+++ b/app/controllers/api/v1/teams_controller.rb
@@ -12,7 +12,7 @@ def index
# @teams = current_user.teams_im_in
# @teams = @teams.preload(:scorers, :members, :cases, :owner).all
# There may be some more fields we could include...
- @teams = current_user.teams.includes( :owner, :members, :teams_scorers, :cases, scorers: [ :teams ] ).all
+ @teams = current_user.teams.includes( :owner, :members, :cases, scorers: [ :teams ] ).all
respond_with @teams
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3167f50b3..7d4b575ad 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -20,10 +20,6 @@ class ApplicationController < ActionController::Base
private
- def ssl_enabled?
- 'true' == ENV['FORCE_SSL']
- end
-
def signup_enabled?
Rails.application.config.signup_enabled
end
diff --git a/app/controllers/concerns/authentication/current_user_manager.rb b/app/controllers/concerns/authentication/current_user_manager.rb
index db1cdd1f8..b17208bd6 100644
--- a/app/controllers/concerns/authentication/current_user_manager.rb
+++ b/app/controllers/concerns/authentication/current_user_manager.rb
@@ -43,7 +43,7 @@ def set_current_user
end
def require_login
- redirect_to secure_path unless @current_user
+ redirect_to sessions_path unless @current_user
end
def auto_login user
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index be17929ce..14609a683 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,6 +1,10 @@
# frozen_string_literal: true
class HomeController < ApplicationController
+ # If Quepid is running on HTTPS, like on Heroku, then it needs to switch
+ # to HTTP in order to make calls to a Solr that is running in HTTP as well, otherwise
+ # you get this "Mixed Content", which browsers block as a security issue.
+ # https://developer.mozilla.org/en-US/docs/Web/Security/Mixed_content
before_action :redirect_to_non_ssl
def index
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 854497c2a..547925bf0 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class ProfilesController < ApplicationController
- force_ssl if: :ssl_enabled?
layout 'account'
def show; end
diff --git a/app/controllers/secure_controller.rb b/app/controllers/secure_controller.rb
index ba9b7812d..588fbc127 100644
--- a/app/controllers/secure_controller.rb
+++ b/app/controllers/secure_controller.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class SecureController < ApplicationController
- force_ssl if: :ssl_enabled?
skip_before_action :require_login
def index
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 3d49abd89..79528efee 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,17 +1,32 @@
# frozen_string_literal: true
class SessionsController < ApplicationController
- force_ssl if: :ssl_enabled?
- skip_before_action :require_login, only: :create
+ skip_before_action :require_login, only: [ :create, :index ]
skip_before_action :check_current_user_locked!, only: :create
skip_before_action :verify_authenticity_token, only: :create
+ layout 'start'
+
+ def index
+ @user = User.new
+ end
+
def create
- user = login(params[:email], params[:password])
+ login_params = user_params
+
+ @user = login(login_params[:email], login_params[:password])
respond_to do |format|
- if user
+ if @user
+ format.html { redirect_to root_path }
format.json { render json: { message: 'connected' }, status: :ok }
else
+ @user = User.new(email: login_params[:email])
+
+ # rubocop:disable Layout/LineLength
+ @user.errors.add(:base,
+ 'Unknown email/password combo. Double check you have the correct email address and password, or sign up for a new account.' )
+ # rubocop:enable Layout/LineLength
+ format.html { render :index }
format.json { render json: { reason: @error }, status: :unprocessable_entity }
end
end
@@ -20,7 +35,7 @@ def create
def destroy
clear_user_session
- redirect_to secure_path
+ redirect_to sessions_path
end
private
@@ -51,4 +66,8 @@ def login email, password
user
end
+
+ def user_params
+ params.require(:user).permit(:email, :password)
+ end
end
diff --git a/app/controllers/users/invitations_controller.rb b/app/controllers/users/invitations_controller.rb
index 3b8ca8f42..e76830b42 100644
--- a/app/controllers/users/invitations_controller.rb
+++ b/app/controllers/users/invitations_controller.rb
@@ -2,10 +2,9 @@
module Users
class InvitationsController < Devise::InvitationsController
- force_ssl if: :ssl_enabled?
skip_before_action :require_login, only: [ :edit, :update ]
- layout 'secure'
+ layout 'start'
# Intercepts the login path and redirects the user to their
# Team page as their first page after joining Quepid!
@@ -16,7 +15,7 @@ def after_accept_path_for resource
def update
unless signup_enabled?
flash.now[:error] = 'Signups are disabled.'
- redirect_to secure_path and return
+ redirect_to sessions_path and return
end
super
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
new file mode 100644
index 000000000..67eb3ad29
--- /dev/null
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Users
+ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+ skip_before_action :require_login, only: [ :keycloakopenid, :google_oauth2, :failure ]
+
+ # rubocop:disable Metrics/AbcSize
+ def keycloakopenid
+ Rails.logger.debug(request.env['omniauth.auth'])
+ @user = create_user_from_omniauth(request.env['omniauth.auth'])
+ @user.errors.add(:base, "Can't log in a locked user." ) if @user.locked
+ if @user.persisted? & !@user.locked
+ session[:current_user_id] = @user.id # this populates our session variable.
+
+ # in this flow, we have a new user joining, so we create a empty case for them, which
+ # on the home_controller.rb triggers the bootstrap and the new case wizard.
+ @user.cases.build case_name: "Case #{@user.cases.size}"
+
+ # sign_in_and_redirect @user, event: :authentication
+ redirect_to root_path
+ else
+ Rails.logger.warn('user not persisted, what do we need to do?')
+ session['devise.keycloakopenid_data'] = request.env['omniauth.auth']
+ redirect_to new_user_registration_url
+ end
+ end
+
+ def google_oauth2
+ Rails.logger.debug(request.env['omniauth.auth'])
+ @user = create_user_from_omniauth(request.env['omniauth.auth'])
+ @user.errors.add(:base, "Can't log in a locked user." ) if @user.locked
+ if @user.errors.empty?
+ session[:current_user_id] = @user.id # this populates our session variable.
+
+ # in this flow, we have a new user joining, so we create a empty case for them, which
+ # on the home_controller.rb triggers the bootstrap and the new case wizard.
+ @user.cases.build case_name: "Case #{@user.cases.size}"
+
+ redirect_to root_path
+ # sign_in_and_redirect @user, event: :authentication
+ else
+ # Removing extra as it can overflow some session stores
+ session['devise.google_data'] = request.env['omniauth.auth'].except('extra')
+ redirect_to root_path, alert: @user.errors.full_messages.join("\n") if @user
+ end
+ end
+ # rubocop:enable Metrics/AbcSize
+
+ def failure
+ redirect_to root_path, alert: 'Could not sign user in with OAuth provider.'
+ end
+
+ private
+
+ # rubocop:disable Metrics/AbcSize
+ # rubocop:disable Metrics/MethodLength
+ def create_user_from_omniauth auth
+ if Rails.application.config.signup_enabled
+ user = User.find_or_initialize_by(email: auth['info']['email'])
+ else
+ user = User.find_by(email: auth['info']['email'])
+ if user.nil? # we looked for a existing user account and didn't find it
+ user = User.new(email: auth['info']['email'])
+ user.errors.add(:base, 'You can only sign in with already created users.' )
+ end
+ end
+
+ user.name = auth['info']['name']
+ user.password = 'fake' if user.password.blank? # If you don't have a password, fake it.
+ user.agreed = true
+
+ user.num_logins ||= 0
+ user.num_logins += 1
+
+ user.profile_pic = auth['info']['image']
+ # user.access_token = auth['credentials']['token']
+ # user.refresh_token = auth['credentials']['refresh_token'] unless auth['credentials']['refresh_token'].nil?
+ # user.expires_at = auth['credentials']['expires_at'] unless auth['credentials']['refresh_token'].nil?
+ user.save! if user.errors.empty?
+ user
+ end
+ # rubocop:enable Metrics/AbcSize
+ # rubocop:enable Metrics/MethodLength
+ end
+end
diff --git a/app/controllers/users/passwords_controller.rb b/app/controllers/users/passwords_controller.rb
index fbddfff95..22cd1d763 100644
--- a/app/controllers/users/passwords_controller.rb
+++ b/app/controllers/users/passwords_controller.rb
@@ -4,13 +4,12 @@ module Users
class PasswordsController < Devise::PasswordsController
include NotificationsManager
- force_ssl if: :ssl_enabled?
skip_before_action :require_login
skip_before_action :require_no_authentication
before_action :check_email
- layout 'secure'
+ layout 'start'
# GET /resource/password/new
# def new
diff --git a/app/controllers/users/signups_controller.rb b/app/controllers/users/signups_controller.rb
new file mode 100644
index 000000000..4944933a1
--- /dev/null
+++ b/app/controllers/users/signups_controller.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Users
+ class SignupsController < ApplicationController
+ skip_before_action :require_login
+ layout 'start'
+
+ # rubocop:disable Metrics/MethodLength
+ def create
+ user_params_to_save = user_params
+
+ # Check if we already have an invite out for this user, and if so let's use that
+ if user_params_to_save[:email].blank?
+ @user = User.new user_params_to_save
+ else
+ @user = User.where(email: user_params_to_save[:email]).where.not(invitation_token: nil).first
+ if @user
+ @user.assign_attributes(user_params_to_save)
+ else
+ @user = User.new user_params_to_save
+ # in this flow, we have a new user joining, so we create a empty case for them, which
+ # on the home_controller.rb triggers the bootstrap and the new case wizard.
+ @user.cases.build case_name: "Case #{@user.cases.size}"
+ end
+ end
+
+ respond_to do |format|
+ format.html do
+ if @user.save
+ session[:current_user_id] = @user.id # not sure if we need to do more here?
+ Analytics::Tracker.track_signup_event @user
+ redirect_to root_path
+ else
+ render template: 'sessions/index'
+ end
+ end
+ format.js
+ end
+ # respond_to do |format|
+ # if @user.save
+ # session[:current_user_id] = @user.id # not sure if we need to do more here?
+ # Analytics::Tracker.track_signup_event @user
+ # format.html { redirect_to root_path }
+ # else
+ # format.html { render template: 'sessions/index' }
+ # end
+ # end
+ end
+ # rubocop:enable Metrics/MethodLength
+
+ private
+
+ def user_params
+ params.require(:user).permit(
+ :name,
+ :email,
+ :password,
+ :password_confirmation,
+ :agreed,
+ :email_marketing
+ )
+ end
+ end
+end
diff --git a/app/helpers/devise_helper.rb b/app/helpers/devise_helper.rb
index f03c7c4f2..d7fd97ec6 100644
--- a/app/helpers/devise_helper.rb
+++ b/app/helpers/devise_helper.rb
@@ -20,7 +20,7 @@ def devise_error_messages!
end
def devise_error_messages?
- resource.errors.empty? ? false : true
+ !resource.errors.empty?
end
def devise_reset_password_error_messages
diff --git a/app/javascripts/channels/consumer.js b/app/javascripts/channels/consumer.js
new file mode 100644
index 000000000..8ec3aad3a
--- /dev/null
+++ b/app/javascripts/channels/consumer.js
@@ -0,0 +1,6 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the `bin/rails generate channel` command.
+
+import { createConsumer } from "@rails/actioncable"
+
+export default createConsumer()
diff --git a/app/javascripts/channels/index.js b/app/javascripts/channels/index.js
new file mode 100644
index 000000000..0cfcf7491
--- /dev/null
+++ b/app/javascripts/channels/index.js
@@ -0,0 +1,5 @@
+// Load all the channels within this directory and all subdirectories.
+// Channel files must be named *_channel.js.
+
+const channels = require.context('.', true, /_channel\.js$/)
+channels.keys().forEach(channels)
diff --git a/app/javascripts/packs/application.js b/app/javascripts/packs/application.js
new file mode 100644
index 000000000..f710851a8
--- /dev/null
+++ b/app/javascripts/packs/application.js
@@ -0,0 +1,13 @@
+// This file is automatically compiled by Webpack, along with any other files
+// present in this directory. You're encouraged to place your actual application logic in
+// a relevant structure within app/javascript and only use these pack files to reference
+// that code so it'll be compiled.
+
+import Rails from "@rails/ujs"
+import Turbolinks from "turbolinks"
+import * as ActiveStorage from "@rails/activestorage"
+import "channels"
+
+Rails.start()
+Turbolinks.start()
+ActiveStorage.start()
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
index d92ffddcb..bef395997 100644
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@@ -1,4 +1,9 @@
# frozen_string_literal: true
class ApplicationJob < ActiveJob::Base
+ # Automatically retry jobs that encountered a deadlock
+ # retry_on ActiveRecord::Deadlocked
+
+ # Most jobs are safe to ignore if the underlying records are no longer available
+ # discard_on ActiveJob::DeserializationError
end
diff --git a/app/jobs/google_analytics_event_job.rb b/app/jobs/google_analytics_event_job.rb
index ff70afed3..a261de255 100644
--- a/app/jobs/google_analytics_event_job.rb
+++ b/app/jobs/google_analytics_event_job.rb
@@ -4,9 +4,9 @@ class GoogleAnalyticsEventJob < ApplicationJob
queue_as :default
def perform data
- return unless Analytics::GA.enabled?
+ return unless Analytics::GoogleAnalytics.enabled?
- Analytics::GA.ga.event(
+ Analytics::GoogleAnalytics.ga.event(
data[:category],
data[:action],
data[:label],
diff --git a/app/models/case.rb b/app/models/case.rb
index 5fac5dd1c..d09e6b6ca 100644
--- a/app/models/case.rb
+++ b/app/models/case.rb
@@ -9,7 +9,7 @@
# search_url :string(500)
# field_spec :string(500)
# last_try_number :integer
-# user_id :integer
+# owner_id :integer
# archived :boolean
# scorer_id :integer
# created_at :datetime not null
@@ -27,7 +27,8 @@ class Case < ApplicationRecord
belongs_to :scorer, optional: true
- belongs_to :user, optional: true
+ belongs_to :owner,
+ class_name: 'User', optional: true
has_many :tries, -> { order(try_number: :desc) },
dependent: :destroy,
@@ -36,7 +37,7 @@ class Case < ApplicationRecord
has_many :metadata,
dependent: :destroy
- # has_many :ratings, # wed ont' actually need htis.
+ # has_many :ratings, # we don't actually need this.
# through: :queries
# rubocop:disable Rails/InverseOf
@@ -84,7 +85,7 @@ class Case < ApplicationRecord
scope :for_user_directly_owned, ->(user) {
where('
- `cases`.`user_id` = ?
+ `cases`.`owner_id` = ?
', user.id)
}
@@ -106,7 +107,7 @@ def really_destroy
# rubocop:disable Metrics/ParameterLists
def clone_case original_case, user, try: nil, clone_queries: false, clone_ratings: false, preserve_history: false
transaction do
- self.user = user
+ self.owner = user
if preserve_history
original_case.tries.each do |a_try|
@@ -153,8 +154,8 @@ def last_score
def set_scorer
return if scorer_id.present?
- self.scorer = if user&.default_scorer
- user.default_scorer
+ self.scorer = if owner&.default_scorer
+ owner.default_scorer
else
Scorer.system_default_scorer
end
diff --git a/app/models/concerns/profile.rb b/app/models/concerns/profile.rb
index 5e77378c9..0f23cc85f 100644
--- a/app/models/concerns/profile.rb
+++ b/app/models/concerns/profile.rb
@@ -12,9 +12,13 @@ module Profile
}.freeze
def avatar_url size = :small
- gravatar_id = Digest::MD5.hexdigest(email.downcase)
- gravatar_size = size_to_number size
- "https://secure.gravatar.com/avatar/#{gravatar_id}.png?s=#{gravatar_size}&d=retro"
+ if profile_pic.present?
+ profile_pic
+ else
+ gravatar_id = Digest::MD5.hexdigest(email.downcase)
+ gravatar_size = size_to_number size
+ "https://secure.gravatar.com/avatar/#{gravatar_id}.png?s=#{gravatar_size}&d=retro"
+ end
end
def display_name
diff --git a/app/models/try.rb b/app/models/try.rb
index 5efd1956e..e9d3d919a 100644
--- a/app/models/try.rb
+++ b/app/models/try.rb
@@ -81,7 +81,7 @@ def add_curator_vars vars = {}
end
def curator_vars_map
- Hash[curator_variables.map { |each| [ each.name.to_sym, each.value ] }]
+ curator_variables.map { |each| [ each.name.to_sym, each.value ] }.to_h
end
def solr_args
diff --git a/app/models/user.rb b/app/models/user.rb
index 09aa2b289..ddde88683 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -30,8 +30,13 @@ class User < ApplicationRecord
# Associations
belongs_to :default_scorer, class_name: 'Scorer', optional: true # for communal scorers there isn't a owner
+ # has_many :cases,
+ # dependent: :nullify # sometimes a case belongs to a team, so don't just delete it.
has_many :cases,
- dependent: :nullify # sometimes a case belongs to a team, so don't just delete it.
+ class_name: 'Case',
+ foreign_key: :owner_id,
+ inverse_of: :owner,
+ dependent: :nullify
has_many :queries, through: :cases
@@ -91,7 +96,7 @@ class User < ApplicationRecord
validates_with ::DefaultScorerExistsValidator
validates :agreed,
- acceptance: { message: 'You must agree to the terms and conditions.' },
+ acceptance: { message: 'checkbox must be clicked to signify you agree to the terms and conditions.' },
if: :terms_and_conditions?
def terms_and_conditions?
@@ -128,7 +133,9 @@ def check_scorer_ownership_before_removing!
# :confirmable, :lockable, :timeoutable and :omniauthable
# devise :invitable, :database_authenticatable, :registerable,
# :recoverable, :rememberable, :trackable, :validatable
- devise :invitable, :recoverable, reset_password_keys: [ :email ]
+ devise :invitable, :recoverable, :omniauthable, omniauth_providers: [ :keycloakopenid, :google_oauth2 ]
+ # devise :omniauthable, omniauth_providers: %i[keycloakopenid]
+ # devise :invitable, :recoverable, :omniauthable
# Devise hacks since we only use the recoverable module
attr_accessor :password_confirmation
diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb
index f7f67a614..5c1d7622e 100644
--- a/app/views/admin/users/_form.html.erb
+++ b/app/views/admin/users/_form.html.erb
@@ -1,4 +1,7 @@
-
+
+
<%= form_for(@user, url: admin_user_path(@user), class: 'form-horizontal') do |f| %>
<% if @user.errors.any? %>
@@ -31,9 +34,44 @@
-
- <%= f.submit class: 'btn btn-primary' %>
-
+ <%= f.submit class: 'btn btn-primary btn-lg' %>
<% end %>
+
+
+
+
+<%= form_for(@user, url: admin_user_path(@user), class: 'form-horizontal') do |f| %>
+
+
+ <% if @user.errors.any? %>
+
+ <%= pluralize(@user.errors.count, "error") %> prohibited this from being saved:
+
+
+ <% @user.errors.full_messages.each do |message| %>
+ - <%= message %>
+ <% end %>
+
+
+ <% end %>
+
+
+ <%= f.label :password, class: 'control-label' %>
+ <%= f.password_field :password, class: 'form-control input-lg', placeholder: 'New Password' %>
+
+
+
+
+ <%= f.label :password_confirmation, class: 'control-label' %>
+ <%= f.password_field :password_confirmation, class: 'form-control input-lg', placeholder: 'Confirm New Password' %>
+
+
+
+
+
+ <% end %>
+
diff --git a/app/views/admin/users/_member.html.erb b/app/views/admin/users/_member.html.erb
deleted file mode 100644
index d586de2d0..000000000
--- a/app/views/admin/users/_member.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-Editing User
- +
<%= render 'form' %>
+
<%= link_to 'Show', admin_user_path(@user) %> |
<%= link_to 'Back', admin_users_path %>
diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb
index bc04e4836..01356455a 100644
--- a/app/views/admin/users/show.html.erb
+++ b/app/views/admin/users/show.html.erb
@@ -3,6 +3,7 @@
<%= @user.display_name %>
<%= notice %>
+ <%= image_tag @user.avatar_url(:big), size:'96x96', class:'img-rounded' %>
diff --git a/app/views/api/v1/cases/_case.json.jbuilder b/app/views/api/v1/cases/_case.json.jbuilder
index 36516eec5..c8ab56c80 100644
--- a/app/views/api/v1/cases/_case.json.jbuilder
+++ b/app/views/api/v1/cases/_case.json.jbuilder
@@ -9,8 +9,8 @@ teams = acase.teams.find_all { |t| current_user.teams.all.include?(t) } unless n
json.case_name acase.case_name
json.caseNo acase.id
json.scorerId acase.scorer_id
-json.owned acase.user_id == current_user.id
-json.owner_name acase.user.name unless acase.user.nil?
+json.owned acase.owner_id == current_user.id
+json.owner_name acase.owner.name if acase.owner.present?
json.queriesCount acase.queries.count
json.teams teams unless no_teams
diff --git a/app/views/api/v1/cases/dropdown/index.json.jbuilder b/app/views/api/v1/cases/dropdown/index.json.jbuilder
index f56438dcd..1c3df21ea 100644
--- a/app/views/api/v1/cases/dropdown/index.json.jbuilder
+++ b/app/views/api/v1/cases/dropdown/index.json.jbuilder
@@ -4,7 +4,7 @@ json.allCases do
json.array! @cases do |acase|
json.case_name acase.case_name
json.caseNo acase.id
- json.owned acase.user_id == current_user.id
+ json.owned acase.owner_id == current_user.id
json.last_try_number acase.tries.best.try_number if acase.tries.present? && acase.tries.best.present?
end
diff --git a/app/views/api/v1/export/ratings/show.rre.json.jbuilder b/app/views/api/v1/export/ratings/show_rre.json.jbuilder
similarity index 100%
rename from app/views/api/v1/export/ratings/show.rre.json.jbuilder
rename to app/views/api/v1/export/ratings/show_rre.json.jbuilder
diff --git a/app/views/layouts/_common_js.html.erb b/app/views/layouts/_common_js.html.erb
index 55d673c0d..054570c57 100644
--- a/app/views/layouts/_common_js.html.erb
+++ b/app/views/layouts/_common_js.html.erb
@@ -1,11 +1,11 @@
-<% if Analytics::GA.enabled? %>
+<% if Analytics::GoogleAnalytics.enabled? %>