Deploying to gh-pages from @ bbf182a918 🚀

src/guard/api/v1/mcaptcha/duration.rs.html

@@ -160,7 +160,6 @@
 <span id="157">157</span>
 <span id="158">158</span>
 <span id="159">159</span>
-<span id="160">160</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="comment">/*
 * Copyright (C) 2021  Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -260,7 +259,6 @@
     <span class="kw">use</span> <span class="ident">actix_web</span>::<span class="ident">test</span>;
 
     <span class="kw">use</span> <span class="kw">super</span>::<span class="kw-2">*</span>;
-    <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">services</span> <span class="kw">as</span> <span class="ident">v1_services</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">tests</span>::<span class="kw-2">*</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="kw-2">*</span>;
 

src/guard/api/v1/mcaptcha/levels.rs.html

@@ -335,7 +335,6 @@
 <span id="332">332</span>
 <span id="333">333</span>
 <span id="334">334</span>
-<span id="335">335</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="comment">/*
 * Copyright (C) 2021  Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -549,7 +548,6 @@
     <span class="kw">use</span> <span class="ident">actix_web</span>::<span class="ident">test</span>;
 
     <span class="kw">use</span> <span class="kw">super</span>::<span class="kw-2">*</span>;
-    <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">services</span> <span class="kw">as</span> <span class="ident">v1_services</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">tests</span>::<span class="kw-2">*</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="kw-2">*</span>;
 

src/guard/api/v1/mcaptcha/mcaptcha.rs.html

@@ -291,7 +291,6 @@
 <span id="288">288</span>
 <span id="289">289</span>
 <span id="290">290</span>
-<span id="291">291</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="comment">/*
 * Copyright (C) 2021  Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -491,7 +490,6 @@
     <span class="kw">use</span> <span class="ident">actix_web</span>::<span class="ident">test</span>;
 
     <span class="kw">use</span> <span class="kw">super</span>::<span class="kw-2">*</span>;
-    <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">services</span> <span class="kw">as</span> <span class="ident">v1_services</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">tests</span>::<span class="kw-2">*</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="kw-2">*</span>;
 

src/guard/api/v1/mod.rs.html

@@ -59,11 +59,6 @@
 <span id="56">56</span>
 <span id="57">57</span>
 <span id="58">58</span>
-<span id="59">59</span>
-<span id="60">60</span>
-<span id="61">61</span>
-<span id="62">62</span>
-<span id="63">63</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="comment">/*
 * Copyright (C) 2021  Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -119,11 +114,6 @@
     <span class="comment">// duration</span>
     <span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">mcaptcha</span>::<span class="ident">duration</span>::<span class="ident">update_duration</span>);
     <span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">mcaptcha</span>::<span class="ident">duration</span>::<span class="ident">get_duration</span>);
-
-    <span class="comment">// pow</span>
-    <span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">pow</span>::<span class="ident">get_config</span>::<span class="ident">get_config</span>);
-    <span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">pow</span>::<span class="ident">verify_pow</span>::<span class="ident">verify_pow</span>);
-    <span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">pow</span>::<span class="ident">verify_token</span>::<span class="ident">validate_captcha_token</span>);
 }
 
 <span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">test</span>)]</span>

src/guard/api/v1/pow/get_config.rs.html

@@ -183,7 +183,6 @@
 <span id="180">180</span>
 <span id="181">181</span>
 <span id="182">182</span>
-<span id="183">183</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="comment">/*
 * Copyright (C) 2021  Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -328,7 +327,6 @@
     <span class="kw">use</span> <span class="ident">m_captcha</span>::<span class="ident">pow</span>::<span class="ident">PoWConfig</span>;
 
     <span class="kw">use</span> <span class="kw">super</span>::<span class="kw-2">*</span>;
-    <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">services</span> <span class="kw">as</span> <span class="ident">v1_services</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">tests</span>::<span class="kw-2">*</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="kw-2">*</span>;
 

src/guard/api/v1/pow/mod.rs.html

@@ -37,6 +37,27 @@
 <span id="34">34</span>
 <span id="35">35</span>
 <span id="36">36</span>
+<span id="37">37</span>
+<span id="38">38</span>
+<span id="39">39</span>
+<span id="40">40</span>
+<span id="41">41</span>
+<span id="42">42</span>
+<span id="43">43</span>
+<span id="44">44</span>
+<span id="45">45</span>
+<span id="46">46</span>
+<span id="47">47</span>
+<span id="48">48</span>
+<span id="49">49</span>
+<span id="50">50</span>
+<span id="51">51</span>
+<span id="52">52</span>
+<span id="53">53</span>
+<span id="54">54</span>
+<span id="55">55</span>
+<span id="56">56</span>
+<span id="57">57</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="comment">/*
 * Copyright (C) 2021  Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -56,7 +77,7 @@
 */</span>
 
 <span class="comment">//use actix_cors::Cors;</span>
-<span class="comment">//use lazy_static::lazy_static;</span>
+<span class="kw">use</span> <span class="ident">actix_web</span>::<span class="ident">web</span>;
 
 <span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">get_config</span>;
 <span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">verify_pow</span>;
@@ -74,6 +95,27 @@
 <span class="comment">//        .max_age(0)</span>
 <span class="comment">//        .send_wildcard();</span>
 <span class="comment">//}</span>
+
+<span class="comment">//pub fn services(cfg: &amp;mut web::ServiceConfig) -&gt; web::Scope&lt;impl actix_service::ServiceFactory&gt; {</span>
+<span class="comment">//    let captcha_api_cors = Cors::default()</span>
+<span class="comment">//        .allow_any_origin()</span>
+<span class="comment">//        .allowed_methods(vec![&quot;POST&quot;])</span>
+<span class="comment">//        .allow_any_header()</span>
+<span class="comment">//        .max_age(0)</span>
+<span class="comment">//        .send_wildcard();</span>
+<span class="comment">//</span>
+<span class="comment">//    web::scope(&quot;/api/v1/pow/*&quot;)</span>
+<span class="comment">//        .wrap(captcha_api_cors)</span>
+<span class="comment">//        .configure(pow_services)</span>
+<span class="comment">//</span>
+<span class="comment">//    // pow</span>
+<span class="comment">//}</span>
+
+<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">services</span>(<span class="ident">cfg</span>: <span class="kw-2">&amp;</span><span class="kw-2">mut</span> <span class="ident">web</span>::<span class="ident">ServiceConfig</span>) {
+    <span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">get_config</span>::<span class="ident">get_config</span>);
+    <span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">verify_pow</span>::<span class="ident">verify_pow</span>);
+    <span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">verify_token</span>::<span class="ident">validate_captcha_token</span>);
+}
 </pre></div>
 </section><section id="search" class="content hidden"></section><section class="footer"></section><div id="rustdoc-vars" data-root-path="../../../../../" data-current-crate="guard"></div>
     <script src="../../../../../main.js"></script><script src="../../../../../source-script.js"></script><script src="../../../../../source-files.js"></script><script defer src="../../../../../search-index.js"></script></body></html>

src/guard/api/v1/pow/verify_pow.rs.html

@@ -129,7 +129,6 @@
 <span id="126">126</span>
 <span id="127">127</span>
 <span id="128">128</span>
-<span id="129">129</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="comment">/*
 * Copyright (C) 2021  Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -180,7 +179,6 @@
 
     <span class="kw">use</span> <span class="kw">super</span>::<span class="kw-2">*</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">pow</span>::<span class="ident">get_config</span>::<span class="ident">GetConfigPayload</span>;
-    <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">services</span> <span class="kw">as</span> <span class="ident">v1_services</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">tests</span>::<span class="kw-2">*</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="kw-2">*</span>;
 

src/guard/api/v1/pow/verify_token.rs.html

@@ -153,7 +153,6 @@
 <span id="150">150</span>
 <span id="151">151</span>
 <span id="152">152</span>
-<span id="153">153</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="comment">/*
 * Copyright (C) 2021  Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -186,7 +185,7 @@
 
 <span class="comment">// API keys are mcaptcha actor names</span>
 
-<span class="attribute">#[<span class="ident">post</span>(<span class="string">&quot;/api/v1/siteverify&quot;</span>)]</span>
+<span class="attribute">#[<span class="ident">post</span>(<span class="string">&quot;/api/v1/pow/siteverify&quot;</span>)]</span>
 <span class="kw">pub</span> <span class="kw">async</span> <span class="kw">fn</span> <span class="ident">validate_captcha_token</span>(
     <span class="ident">payload</span>: <span class="ident">web</span>::<span class="ident">Json</span><span class="op">&lt;</span><span class="ident">VerifyCaptchaResult</span><span class="op">&gt;</span>,
     <span class="ident">data</span>: <span class="ident">web</span>::<span class="ident">Data</span><span class="op">&lt;</span><span class="ident">Data</span><span class="op">&gt;</span>,
@@ -210,7 +209,6 @@
     <span class="kw">use</span> <span class="kw">super</span>::<span class="kw-2">*</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">pow</span>::<span class="ident">get_config</span>::<span class="ident">GetConfigPayload</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">pow</span>::<span class="ident">verify_pow</span>::<span class="ident">ValidationToken</span>;
-    <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">services</span> <span class="kw">as</span> <span class="ident">v1_services</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">tests</span>::<span class="kw-2">*</span>;
     <span class="kw">use</span> <span class="kw">crate</span>::<span class="kw-2">*</span>;
 
@@ -221,7 +219,7 @@
         <span class="kw">const</span> <span class="ident">EMAIL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;verifyuser@enter.com&quot;</span>;
         <span class="kw">const</span> <span class="ident">VERIFY_CAPTCHA_URL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;/api/v1/mcaptcha/pow/verify&quot;</span>;
         <span class="kw">const</span> <span class="ident">GET_URL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;/api/v1/mcaptcha/pow/config&quot;</span>;
-        <span class="kw">const</span> <span class="ident">VERIFY_TOKEN_URL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;/api/v1/siteverify&quot;</span>;
+        <span class="kw">const</span> <span class="ident">VERIFY_TOKEN_URL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;/api/v1/pow/siteverify&quot;</span>;
         <span class="comment">//        const UPDATE_URL: &amp;str = &quot;/api/v1/mcaptcha/domain/token/duration/update&quot;;</span>
 
         {

src/guard/main.rs.html

@@ -124,6 +124,20 @@
 <span id="121">121</span>
 <span id="122">122</span>
 <span id="123">123</span>
+<span id="124">124</span>
+<span id="125">125</span>
+<span id="126">126</span>
+<span id="127">127</span>
+<span id="128">128</span>
+<span id="129">129</span>
+<span id="130">130</span>
+<span id="131">131</span>
+<span id="132">132</span>
+<span id="133">133</span>
+<span id="134">134</span>
+<span id="135">135</span>
+<span id="136">136</span>
+<span id="137">137</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="comment">/*
 * Copyright (C) 2021  Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -143,10 +157,11 @@
 */</span>
 <span class="kw">use</span> <span class="ident">std</span>::<span class="ident">env</span>;
 
+<span class="kw">use</span> <span class="ident">actix_cors</span>::<span class="ident">Cors</span>;
 <span class="kw">use</span> <span class="ident">actix_identity</span>::{<span class="ident">CookieIdentityPolicy</span>, <span class="ident">IdentityService</span>};
 <span class="kw">use</span> <span class="ident">actix_web</span>::{
-    <span class="ident">client</span>::<span class="ident">Client</span>, <span class="ident">error</span>::<span class="ident">InternalError</span>, <span class="ident">http</span>::<span class="ident">StatusCode</span>, <span class="ident">middleware</span>, <span class="ident">web</span>::<span class="ident">JsonConfig</span>, <span class="ident">App</span>,
-    <span class="ident">HttpServer</span>,
+    <span class="ident">client</span>::<span class="ident">Client</span>, <span class="ident">error</span>::<span class="ident">InternalError</span>, <span class="ident">http</span>::<span class="ident">StatusCode</span>, <span class="ident">middleware</span>, <span class="ident">web</span>::<span class="ident">scope</span>,
+    <span class="ident">web</span>::<span class="ident">JsonConfig</span>, <span class="ident">App</span>, <span class="ident">HttpServer</span>,
 };
 <span class="comment">//use awc::Client;</span>
 <span class="kw">use</span> <span class="ident">cache_buster</span>::<span class="ident">Files</span> <span class="kw">as</span> <span class="ident">FileMap</span>;
@@ -206,6 +221,14 @@
 
     <span class="ident">HttpServer</span>::<span class="ident">new</span>(<span class="kw">move</span> <span class="op">|</span><span class="op">|</span> {
         <span class="kw">let</span> <span class="ident">client</span> <span class="op">=</span> <span class="ident">Client</span>::<span class="ident">default</span>();
+
+        <span class="kw">let</span> <span class="ident">captcha_api_cors</span> <span class="op">=</span> <span class="ident">Cors</span>::<span class="ident">default</span>()
+            .<span class="ident">allow_any_origin</span>()
+            .<span class="ident">allowed_methods</span>(<span class="macro">vec</span><span class="macro">!</span>[<span class="string">&quot;POST&quot;</span>])
+            .<span class="ident">allow_any_header</span>()
+            .<span class="ident">max_age</span>(<span class="number">0</span>)
+            .<span class="ident">send_wildcard</span>();
+
         <span class="ident">App</span>::<span class="ident">new</span>()
             .<span class="ident">wrap</span>(<span class="ident">middleware</span>::<span class="ident">Logger</span>::<span class="ident">default</span>())
             .<span class="ident">wrap</span>(<span class="ident">get_identity_service</span>())
@@ -216,6 +239,11 @@
                 <span class="ident">middleware</span>::<span class="ident">normalize</span>::<span class="ident">TrailingSlash</span>::<span class="ident">Trim</span>,
             ))
             .<span class="ident">configure</span>(<span class="ident">v1</span>::<span class="ident">services</span>)
+            .<span class="ident">service</span>(
+                <span class="ident">scope</span>(<span class="string">&quot;/api/v1/pow&quot;</span>)
+                    .<span class="ident">wrap</span>(<span class="ident">captcha_api_cors</span>)
+                    .<span class="ident">configure</span>(<span class="ident">v1</span>::<span class="ident">pow</span>::<span class="ident">services</span>),
+            )
             .<span class="ident">configure</span>(<span class="ident">docs</span>::<span class="ident">services</span>)
             .<span class="ident">configure</span>(<span class="ident">templates</span>::<span class="ident">services</span>)
             .<span class="ident">configure</span>(<span class="ident">static_assets</span>::<span class="ident">services</span>)