Merge pull request #1588 from tamo/google-oauth-verified

hackmdio · May 11, 2021 · 6585976 · 6585976
2 parents ee1230b + 1920978
commit 6585976
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/app.js b/app.js
@@ -194,6 +194,7 @@ app.set('view engine', 'ejs')
 app.locals.useCDN = config.useCDN
 app.locals.serverURL = config.serverURL
 app.locals.sourceURL = config.sourceURL
+app.locals.privacyPolicyURL = config.privacyPolicyURL
 app.locals.allowAnonymous = config.allowAnonymous
 app.locals.allowAnonymousEdits = config.allowAnonymousEdits
 app.locals.permission = config.permission

diff --git a/lib/config/default.js b/lib/config/default.js
@@ -37,6 +37,7 @@ module.exports = {
   defaultPermission: 'editable',
   dbURL: '',
   db: {},
+  privacyPolicyURL: '',
   // ssl path
   sslKeyPath: '',
   sslCertPath: '',

diff --git a/lib/config/environment.js b/lib/config/environment.js
@@ -35,6 +35,7 @@ module.exports = {
   sessionSecret: process.env.CMD_SESSION_SECRET,
   sessionLife: toIntegerConfig(process.env.CMD_SESSION_LIFE),
   responseMaxLag: toIntegerConfig(process.env.CMD_RESPONSE_MAX_LAG),
+  privacyPolicyURL: process.env.CMD_PRIVACY_POLICY_URL,
   imageUploadType: process.env.CMD_IMAGE_UPLOAD_TYPE,
   imgur: {
     clientID: process.env.CMD_IMGUR_CLIENTID

diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
@@ -156,6 +156,7 @@
                     <h6 class="social-foot">
                         <%- __('Follow us on %s and %s.', '<a href="https://github.com/hackmdio/CodiMD" target="_blank" rel="noopener"><i class="fa fa-github"></i> GitHub</a>, <a href="https://gitter.im/hackmdio/hackmd" target="_blank" rel="noopener"><i class="fa fa-comments"></i> Gitter</a>', '<a href="https://poeditor.com/join/project/q0nuPWyztp" target="_blank" rel="noopener"><i class="fa fa-globe"></i> POEditor</a>') %>
                     </h6>
+                    <% if(privacyPolicyURL && privacyPolicyURL.length > 0) { %><p><a href="<%- privacyPolicyURL %>"><%= __('Privacy Policy') %></a></p><% } %>
                 </div>
             </div>
         </div>

diff --git a/public/views/shared/signin-modal.ejs b/public/views/shared/signin-modal.ejs
@@ -44,8 +44,8 @@
                 </a>
                 <% } %>
                 <% if (authProviders.google) { %>
-                <a href="<%- serverURL %>/auth/google" class="btn btn-lg btn-block btn-login-method btn-google">
-                    <i class="fa fa-google"></i> <%= __('Sign in via %s', 'Google') %>
+                <a href="<%- serverURL %>/auth/google" class="btn btn-lg btn-block" style="color: #fff; background-color: #4285F4; vertical-align: middle; font-size: 14px; font-family: Roboto;">
+                    <svg aria-hidden="true" width="34" height="34" viewBox="-8 -8 34 34" style="vertical-align: middle; margin-right: 16; background-color=#fff;"><path d="M16.51 8H8.98v3h4.3c-.18 1-.74 1.48-1.6 2.04v2.01h2.6a7.8 7.8 0 002.38-5.88c0-.57-.05-.66-.15-1.18z" fill="#4285F4"></path><path d="M8.98 17c2.16 0 3.97-.72 5.3-1.94l-2.6-2a4.8 4.8 0 01-7.18-2.54H1.83v2.07A8 8 0 008.98 17z" fill="#34A853"></path><path d="M4.5 10.52a4.8 4.8 0 010-3.04V5.41H1.83a8 8 0 000 7.18l2.67-2.07z" fill="#FBBC05"></path><path d="M8.98 4.18c1.17 0 2.23.4 3.06 1.2l2.3-2.3A8 8 0 001.83 5.4L4.5 7.49a4.77 4.77 0 014.48-3.3z" fill="#EA4335"></path></svg> <%= __('Sign in via %s', 'Google') %>
                 </a>
                 <% } %>
                 <% if (authProviders.saml) { %>