Răsfoiți Sursa

save on/off, id, secret

sou 7 ani în urmă
părinte
comite
c166c0897b
3 a modificat fișierele cu 48 adăugiri și 1 ștergeri
  1. 3 0
      lib/routes/index.js
  2. 1 1
      lib/service/passport.js
  3. 44 0
      lib/views/login.html

+ 3 - 0
lib/routes/index.js

@@ -66,7 +66,10 @@ module.exports = function(crowi, app) {
   app.post('/_api/admin/security/google'        , loginRequired(crowi, app) , middleware.adminRequired() , csrf, form.admin.securityGoogle, admin.api.securitySetting);
   app.post('/_api/admin/security/mechanism'     , loginRequired(crowi, app) , middleware.adminRequired() , csrf, form.admin.securityMechanism, admin.api.securitySetting);
   app.post('/_api/admin/security/passport-ldap' , loginRequired(crowi, app) , middleware.adminRequired() , csrf, form.admin.securityPassportLdap, admin.api.securityPassportLdapSetting);
+
+  // OAuth
   app.post('/_api/admin/security/passport-google', loginRequired(crowi, app) , middleware.adminRequired() , csrf, form.admin.securityPassportGoogle, admin.api.securityPassportGoogleSetting);
+  // app.get('/auth/passport/google/callback', loginPassport.loginPassportGoogleCallback);
 
   // markdown admin
   app.get('/admin/markdown'                   , loginRequired(crowi, app) , middleware.adminRequired() , admin.markdown.index);

+ 1 - 1
lib/service/passport.js

@@ -274,7 +274,7 @@ class PassportService {
     //     done(null, ldapAccountInfo);
     //   }
     // ));
-    console.log('rere')
+
     passport.use(new GoogleStrategy({
       clientID: config.crowi['google:clientId'],
       clientSecret: config.crowi['google:clientSecret'],

+ 44 - 0
lib/views/login.html

@@ -145,6 +145,50 @@
         </div>
         {% endif %}
 
+        <hr>
+        <div class="input-group m-t-15 m-b-10 mx-auto d-flex flex-row justify-content-around flex-wrap">
+          {#% if passportGoogleLoginEnabled() %#}
+          <form role="form" action="/auth/passport/google" method="get">
+            <input type="hidden" name="_csrf" value="{{ csrf() }}">
+            <button type="submit" class="fcbtn btn btn-danger btn-1b btn-login-google">
+              <span class="btn-label"><i class="icon-social-google"></i></span>
+              {{ t('Sign in') }}(passport)
+            </button>
+            <div class="small text-right">by Google Account</div>
+          </form>
+          {#% endif %#}
+          {#% if passportGithubLoginEnabled() %#}
+          <form role="form" action="/auth/passport/github" method="get">
+            <input type="hidden" name="_csrf" value="{{ csrf() }}">
+            <button type="submit" class="fcbtn btn btn-danger btn-1b btn-login-github">
+              <span class="btn-label"><i class="icon-social-github"></i></span>
+              {{ t('Sign in') }}
+            </button>
+            <div class="small text-right">by Github Account</div>
+          </form>
+          {#% endif %#}
+          {#% if passportFacebookLoginEnabled() %#}
+          <form role="form" action="/auth/passport/facebook" method="get">
+            <input type="hidden" name="_csrf" value="{{ csrf() }}">
+            <button type="submit" class="fcbtn btn btn-danger btn-1b btn-login-facebook">
+              <span class="btn-label"><i class="icon-social-facebook"></i></span>
+              {{ t('Sign in') }}
+            </button>
+            <div class="small text-right">by Facebook Account</div>
+          </form>
+          {#% endif %#}
+          {#% if passportTwitterLoginEnabled() %#}
+          <form role="form" action="/auth/passport/twitter" method="get">
+            <input type="hidden" name="_csrf" value="{{ csrf() }}">
+            <button type="submit" class="fcbtn btn btn-danger btn-1b btn-login-twitter">
+              <span class="btn-label"><i class="icon-social-twitter"></i></span>
+              {{ t('Sign in') }}
+            </button>
+            <div class="small text-right">by Twitter Account</div>
+          </form>
+          {#% endif %#}
+        </div>
+
         <hr>
 
         <div class="row">