Fix user count (#158)

* increment user count (fixes #136)

* fix urls for login services

* add note about fixcount script

Co-authored-by: Luigi Marini <[email protected]>

Author: robkooper

CHANGELOG.md

@@ -6,9 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+Google will no longer work as login provider, we are working on this issue #157.
+
+If non local accounts are used the count can be wrong. Use the [fixcounts](https://github.com/clowder-framework/clowder/blob/develop/scripts/updates/fix-counts.js)
+script to fix this.
+
 ### Fixed
+- Error logging in with orcid due to changed URL #91
+- Fixed error in url for twitter login
+- Count of users is not correct if using anything else but local accounts #136
 - Files were not properly reindexed when the Move button was used to move a file into or out of a folder in a dataset. 
-  This has been fixed.
 - When adding a file to a dataset by URL, prioritize the URL `content-type` header over the file content type established
   by looking at the file name extension.
 

app/services/SecureSocialEventListener.scala

@@ -10,11 +10,11 @@ import securesocial.core.providers.UsernamePasswordProvider
 
 class SecureSocialEventListener(app: play.api.Application) extends EventListener {
   override def id: String = "SecureSocialEventListener"
+  lazy val userService: UserService = DI.injector.getInstance(classOf[UserService])
+  lazy val spaceService: SpaceService = DI.injector.getInstance(classOf[SpaceService])
+  lazy val appConfig: AppConfigurationService = DI.injector.getInstance(classOf[AppConfigurationService])
 
   def onEvent(event: Event, request: RequestHeader, session: Session): Option[Session] = {
-    val userService: UserService = DI.injector.getInstance(classOf[UserService])
-    val spaceService: SpaceService = DI.injector.getInstance(classOf[SpaceService])
-
     event match {
       case e: SignUpEvent => {
         userService.findByIdentity(event.user) match {
@@ -40,6 +40,7 @@ class SecureSocialEventListener(app: play.api.Application) extends EventListener
               val subject = s"[${AppConfiguration.getDisplayName}] new user signup"
               val body = views.html.emails.userSignup(user)(request)
               util.Mail.sendEmailAdmins(subject, Some(user), body)
+              appConfig.incrementCount('users, 1)
             }
             user.email match {
               case Some(e) => spaceService.processInvitation(e)

conf/securesocial.conf

@@ -79,9 +79,9 @@ securesocial {
     ssl=false
 
     twitter {
-        requestTokenUrl="https://twitter.com/oauth/request_token"
-        accessTokenUrl="https://twitter.com/oauth/access_token"
-        authorizationUrl="https://twitter.com/oauth/authenticate"
+        requestTokenUrl="https://api.twitter.com/oauth/request_token"
+        accessTokenUrl="https://api.twitter.com/oauth/access_token"
+        authorizationUrl="https://api.twitter.com/oauth/authorize"
         consumerKey=your_consumer_key
         consumerSecret=your_consumer_secret
     }
@@ -135,7 +135,7 @@ securesocial {
 
     orcid {
         authorizationUrl="https://orcid.org/oauth/authorize"
-        accessTokenUrl="https://pub.orcid.org/oauth/token"
+        accessTokenUrl="https://orcid.org/oauth/token"
         clientId=your_client_id
         clientSecret=your_client_secret
         scope="/authenticate"