Merge pull request #143 from terales/142-deprecate-google-api

Deprecate Google API, closes #142
terales · Apr 14, 2019 · b6a640f · b6a640f
2 parents ed22910 + dad7be4
commit b6a640f
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 51 deletions.
diff --git a/.env-template b/.env-template
@@ -22,6 +22,3 @@ AVATAR_HEIGHT=100
 
 # Get GitHub token with user.read scope. See more: https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/
 GITHUB_TOKEN=
-
-# Create project, enable Google+ API and get an API key. See more: https://developers.google.com/+/web/api/rest/oauth#apikey
-GOOGLE_KEY=
diff --git a/README.md b/README.md
@@ -38,10 +38,13 @@ Uptime: [![Uptime](http://www.sixnines.io/b/28f4)](http://www.sixnines.io/h/28f4
 
 * Facebook with id, like `100001584476227` OR profile slug, like `yegor256`
 * GitHub with login, like `terales`
-* Google with Google+ id, like `+SriramSaroop` OR gmail address
 * Gravatar with email
 * Twitter with username, like `robwormald`
 
+#### Deprecated
+
+* Google with Google+ id, like `+SriramSaroop` OR gmail address
+
 ### Resize images with Cloudinary
 
 Thanks to the Cloudinary generous limits we are able to resize images from any source.

diff --git a/src/public/index.html b/src/public/index.html
@@ -51,11 +51,6 @@ <h3 style="margin-bottom: 0.6em;">Currently supported sources</h3>
                     <i class="example" style="background-image: url('/github/yegor256/30-30');"></i>
                     <strong>GitHub</strong> with login, like <code>yegor256</code>: <a href="/github/yegor256" target="_blank">/github/yegor256</a>
                 </li>
-                <li>
-                    <i class="example" style="background-image: url('/google/+SriramSaroop/30-30');"></i>
-                    <strong>Google</strong> with Google+ id, like <code>+SriramSaroop</code>: <a href="/google/+SriramSaroop" target="_blank">/google/+SriramSaroop</a>
-                        <br>with GMail address, like <code>email@gmail.com</code>: <a href="/google/terehov.alexander.serg@gmail.com" target="_blank">/google/email@gmail.com</a>
-                </li>
                 <li>
                     <i class="example" style="background-image: url('/gravatar/terehov.alexander.serg@gmail.com/30-30');"></i>
                     <strong>Gravatar</strong> with email: <a href="/gravatar/terehov.alexander.serg@gmail.com" target="_blank">/gravatar/email@example.com</a>
@@ -68,6 +63,13 @@ <h3 style="margin-bottom: 0.6em;">Currently supported sources</h3>
                     <i class="example" style="background-image: url('/fallback/image/30-30');"></i>
                     Automatically fallback to good enough placeholder image
                 </li>
+                <li>
+                    deprecated
+                    <s>
+                        <strong>Google</strong> with Google+ id, like <code>+SriramSaroop</code>: <a href="/google/+SriramSaroop" target="_blank">/google/+SriramSaroop</a>
+                        <br>with GMail address, like <code>email@gmail.com</code>: <a href="/google/email@gmail.com" target="_blank">/google/email@gmail.com</a>
+                    </s>
+                </li>
             </ul>
 
             <h3>Get images with size you need thanks to Cloudinary integration</h3>

diff --git a/src/sources/google.js b/src/sources/google.js
diff --git a/tests/helpers/runForPullRequestFromFork.js b/tests/helpers/runForPullRequestFromFork.js
@@ -1,7 +1,5 @@
 
 module.exports = function runForPullRequestFromFork (source) {
-  if (source === 'google' && !process.env.GOOGLE_KEY) { return false }
-
   if (source === 'github' && !process.env.GITHUB_TOKEN) { return false }
 
   return true

diff --git a/tests/respectEtagHeader.test.js b/tests/respectEtagHeader.test.js
diff --git a/tests/sources/google/samples/+RaviChahar27.jpeg b/tests/sources/google/samples/+RaviChahar27.jpeg
diff --git a/tests/sources/google/samples/+SriramSaroop.jpeg b/tests/sources/google/samples/+SriramSaroop.jpeg
diff --git a/tests/sources/google/samples/+krunalsisodiya.jpeg b/tests/sources/google/samples/+krunalsisodiya.jpeg
diff --git a/tests/sources/google/samples/socatar.com@gmail.com.png b/tests/sources/google/samples/socatar.com@gmail.com.png
diff --git a/tests/sources/google/samples/terehov.alexander.serg@gmail.com.jpeg b/tests/sources/google/samples/terehov.alexander.serg@gmail.com.jpeg
diff --git a/tests/sources/google/samples/terehov.in.intext@gmail.com.jpeg b/tests/sources/google/samples/terehov.in.intext@gmail.com.jpeg
diff --git a/tests/testNativeResize/supportNativeResize.test.js b/tests/testNativeResize/supportNativeResize.test.js
@@ -9,7 +9,7 @@ const rimraf = require('rimraf')
 const app = require('./../../src/app')()
 
 // Test helpers
-const testRunner = require('./../helpers/runForPullRequestFromFork')('google') ? test : test.skip
+const testRunner = require('./../helpers/runForPullRequestFromFork')('github') ? test : test.skip
 const getImagesFromFolder = require('./../helpers/getImagesFromFolder')
 const imageMagicCompare = require('./../helpers/imageMagicCompare')
 const saveReceivedImage = require('./../helpers/saveReceivedImage')