Change redirect to just return page

Add redirect to index page if path ends in /
Omniauth / omnigollum integration
2022-10-07 17:10:33 -06:00 · 2022-10-07 17:01:56 -06:00 · 2022-09-27 13:32:51 -06:00
6 changed files with 58 additions and 3 deletions
@@ -1212,6 +1212,7 @@ Gem::Specification.new do |s|
    lib/gollum/templates/pagination.mustache
    lib/gollum/templates/search.mustache
    lib/gollum/templates/searchbar.mustache
+    lib/gollum/templates/user.mustache
    lib/gollum/templates/wiki_content.mustache
    lib/gollum/uri_encode_component.rb
    lib/gollum/views/commit.rb
@@ -211,7 +211,7 @@ module Precious
      end

      get '/edit/*' do
-        forbid unless @allow_editing
+        forbid unless @allow_editing && @user_authed
        wikip = wiki_page(params[:splat].first)
        @name = wikip.fullname
        @path = wikip.path
@@ -234,6 +234,7 @@ module Precious

        wiki = wiki_new
        halt 405 unless wiki.allow_uploads
+        forbid unless @user_authed

        if params[:file]
          fullname = params[:file][:filename]
@@ -290,6 +291,7 @@ module Precious
      post '/rename/*' do
        wikip = wiki_page(params[:splat].first)
        halt 500 if wikip.nil?
+        forbid unless @user_authed
        wiki   = wikip.wiki
        page   = wikip.page
        rename = params[:rename]
@@ -333,6 +335,7 @@ module Precious
        path      = "/#{clean_url(sanitize_empty_params(params[:path]))}"
        wiki      = wiki_new
        page      = wiki.page(::File.join(path, params[:page]))
+        forbid unless @user_authed

        return if page.nil?
        if etag != page.sha
@@ -353,6 +356,7 @@ module Precious

      post '/delete/*' do
        forbid unless @allow_editing
+        forbid unless @user_authed
        wiki = wiki_new
        filepath = params[:splat].first
        unless filepath.nil?
@@ -389,6 +393,7 @@ module Precious
        path   = sanitize_empty_params(params[:path]) || ''
        format = params[:format].intern
        wiki   = wiki_new
+        forbid unless @user_authed

        path.gsub!(/^\//, '')

@@ -620,7 +625,23 @@ module Precious

    def show_page_or_file(fullpath)
      wiki = wiki_new
-      if page = wiki.page(fullpath)
+      if page = fullpath[-1] != '/' ? wiki.page("#{fullpath}/#{wiki.index_page}") : false
+        @page          = page
+        @name          = page.filename_stripped
+        @content       = page.formatted_data
+        @upload_dest   = find_upload_dest(Pathname.new(fullpath).cleanpath.to_s)
+
+        # Extensions and layout data
+        @editable      = true
+        @toc_content   = wiki.universal_toc ? @page.toc_data : nil
+        @h1_title      = wiki.h1_title
+        @bar_side      = wiki.bar_side
+        @allow_uploads = wiki.allow_uploads
+        @navbar        = true
+        mustache :page
+        #redirect_path = "#{fullpath}/#{wiki.index_page}"
+        #redirect to("#{encodeURIComponent(redirect_path)}")
+      elsif page = wiki.page(fullpath)
        @page          = page
        @name          = page.filename_stripped
        @content       = page.formatted_data
@@ -639,7 +660,7 @@ module Precious
      elsif @redirects_enabled && redirect_path = wiki.redirects[fullpath]
        redirect to("#{encodeURIComponent(redirect_path)}?redirected_from=#{encodeURIComponent(fullpath)}")
      else
-        if @allow_editing
+        if @allow_editing && @user_authed
          path = fullpath[-1] == '/' ? "#{fullpath}#{wiki.index_page}" : fullpath # Append default index page if no page name is supplied
          redirect to("/gollum/create/#{clean_url(encodeURIComponent(path))}")
        else
@@ -734,3 +734,12 @@ nav.actions {
    display: none;
   }
 }
+
+/* @section user */
+#user p {
+    text-align: right;
+    padding-right:0.5em;
+    font-size: .8em;
+    line-height: 2.0em;
+    color: #999;
+}
@@ -60,6 +60,7 @@
 <body>
 <div class="container-lg clearfix">
 {{{yield}}}
+{{< user}}
 </div>
 </body>
 </html>
@@ -0,0 +1,10 @@
+<div id="user">
+    <p>
+    {{#user_authed}}
+      {{user_name}} | {{user_provider}} | <strong><a href="/__omnigollum__/logout">[Logout]</a></strong>
+    {{/user_authed}}
+    {{^user_authed}}
+      not logged in | <strong><a href="/__omnigollum__/login">[Login]</a></strong>
+    {{/user_authed}}
+    <p>
+</div>
@@ -87,6 +87,19 @@ module Precious
      def latest_changes
        false
      end
+
+      # Passthrough additional omniauth parameters for status bar
+      def user_authed
+        @user_authed
+      end
+
+      def user_provider
+        @user.provider
+      end
+
+      def user_name
+        @user.name
+      end
      
    end
  end
Author	SHA1	Message	Date
restitux	0615815fa2	Change redirect to just return page	2022-10-07 17:10:33 -06:00
restitux	8714157262	Add redirect to index page if path ends in /	2022-10-07 17:01:56 -06:00
restitux	7a1b45a99f	Omniauth / omnigollum integration Based on: https://github.com/remyd1/gollum/commit/925ebcfe04f294c979b9e088dc0955ca1dfa8c44	2022-09-27 13:32:51 -06:00